X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=TODO;h=a1dd9285a02329f604361ed326ca9d45207a654f;hb=b0a3de01936a39803e0e5d2d62d9c544cd126d2e;hp=3c9946f252f614d9fb49e5bc7d96f4c03f517eb2;hpb=9631a0e5ff90b2c559c14435fe43c33322d1ec2c;p=git.git diff --git a/TODO b/TODO index 3c9946f2..a1dd9285 100644 --- a/TODO +++ b/TODO @@ -6,23 +6,8 @@ The GIT To-Do File http://kernel.org/git/?p=git/git.git;a=blob;hb=todo;f=TODO -Tool Renames Plan -================= - - - Immedately after 0.99.9, the backward compatible symbolic - links in $(bindir) will be removed [DONE]. - - git-ssh-push and git-ssh-pull pair is not going away if ever. - Each of these old-name commands continues to invoke its - old-name counterpart on the other end. - - - There was a discussion to move bulk of the git-* programs out - of /usr/bin and use /usr/lib/git; the central mechanism was - done, but the actual move is postponed post 1.0. - - -What to expect after 0.99.9 -=========================== +What to expect from now on +========================== This is written in a form of to-do list for me, so if I say "accept patch", it means I do not currently plan to do that @@ -35,60 +20,56 @@ patch, perhaps ;-). Documentation ------------- -* Help Jon Loeliger to find place in the documentation to place - his drawing [DONE]. +* Take the updated tutorial by Bruce Fields very seriously. It + is a quite good initiative. -* Accept patches from people who actually have done CVS - migration and update the cvs-migration documentation. - Link the documentation from the main git.txt page. -* Talk about using rsync just once at the beginning when - initializing a remote repository so that local packs do not - need to be expanded. I personally do not think we need tool - support for this (but see below about optimized cloning). +Design issues +------------- -* Maybe update tutorial with a toy project that involves two or - three developers. +* Plug-in file-level merges. On the other hand, we may not even + need this; just tell people to run "xxdiff -U" on the working + tree files. -* Update tutorial to cover setting up repository hooks to do - common tasks. +* Doing a merge in a separate directory. -* Do we still have missing docs? If so accept patches to finish - them. +* Subprojects. I think the "bind commit" approach has been + outlined at sufficiently detailed level. Maybe find time to + actually start prototyping it? -* Accept patches to talk about "Whoops, it broke. What's - next?" [Started]. + <7vacdzkww3.fsf@assigned-by-dhcp.cox.net> -* Accept patches to make formatted tables in asciidoc to work - well in both html and man pages (see git-diff(1)). +* Make 'format-patch' take revision limiters similar to + rev-list. For example: + A C + ....---x---o---o---x---o---o + / + / + / + ....---x---o---o + B -Technical (heavier) -------------------- + we should be able to format commits 'o', without duplicates, + by: + + $ git format-patch ^A ^B C -* Assess the side effects of "make the rest of the things - magically work from any subdirectory" change by Linus. It is - a good change in principle and we would like to have that - behaviour but some tool implementations I am sure are assuming - to never run from anywhere other than the top. [Post 1.0] + Currently the closest approximation is -* Ref namespace management. Perhaps use refs/local/ suggestion - by Linus. + $ git format-patch A..C B..C -* Git daemon, when deployed at kernel.org, might turn out to be - quite a burden, since it needs to generate customized packs - every time a new request comes in. It may be worthwhile to - precompute some packs for popular sets of heads downloaders - have and serve that, even if that could give more than the - client asks for in some cases. We will know about this soon - enough [DONE part to allow using precomputed pack, but not - dynamic caching part]. + which results in the last two commits including C formatted + twice. + + +Technical (heavier) +------------------- * Libification. There are many places "run once" mentality is ingrained in the management of basic data structures, which need to be fixed. [Matthias Urlichs is already working on - this: ; Post - 1.0]. + this: ] * Maybe a pack optimizer. @@ -100,119 +81,98 @@ Technical (heavier) closely, (3) somebody who tends to follow only the point releases. -* Maybe an Emacs VC backend. + This needs a matching smart on the dumb protocol downloader. -* 'git split-projects'? This requires updated 'git-rev-list' to - skip irrelevant commits. - Message-ID: +* Maybe an Emacs VC backend. * Look at libified GNU diff CVS seems to use, or libxdiff. [Daniel has his own diff tool almost ready to start - integrating and testing; Post 1.0] - -* Plug-in file-level merges [Post 1.0]. + integrating and testing] Technical (milder) ------------------ -* merge-recursive needs to register conflicting paths as higher - stage entries in the index. For that, it first needs to - construct three trees whose paths are already renamed, and - call 3-way read-tree. +* Decide what to do about rebase applied to merged head. One + extreme is to allow rebase if "rev-list ours..theirs" gives + anything. This loosens the current merge-base based approach. + The other extreme is to refuse rebase if "rev-list + theirs..ours" contains any merge commit, which was discussed + on the list. -* Binary package split. Plan laid out and discussion mostly - done. [RPM side done; Debian side delegated] + <43CC695E.2020506@codeweavers.com> -* User-relative paths by Andreas Ericsson. [DONE] +* Decide what the right thing to do upon an empty merge commit, + when both branches happen to have obtained the same set of + changes through different history. Not recording such keeps + the history simpler, and the next merge would soon create a + true merge commit anyway, but does not feel quite right. -* Accessing configuration variables from C and from scripts by - Johannes [DONE]. + <20060114021800.4688.qmail@web31803.mail.mud.yahoo.com> -* Proxing git:// connection by Paul Collins. [DONE] +* Perhaps a smarter HTTP anonymous download via CGI. -* Maybe look at Cogito and see if I can help Pasky to adjust to - the later core features? +* Prepare to enable "always use symbolic refs for HEAD" patch. + We need a timeline to force Porcelains to get ready. All the + major ones should be ready now. -* Perhaps detect cloning request in upload-pack and cache the - result for next cloning request until any of our refs change. +* Prepare to enable "most of the things are installed in + GIT_EXEC_PATH not in bindir". I do not plan to set bindir != + gitexecdir myself in the main Makefile I ship, but distos + should be able to choose to do so. -* Encourage concrete proposals to commit log message templates - we discussed some time ago. +* Forbid/ignore pack names that do not conform to the convention + sha1_pack_name() assumes and reject in check_packed_git_idx() + [In "pu"] -* Perhaps accept patches to do undo/redo. +* Any Porcelain-ish we forgot or punted to make usable from + subdirectory? I think the last pass caught everything and + what are remaining are whole-tree or whole repository + operations. + +* diff stopping at the first output; qgit wants to know if this + tree has any A or D from the other tree and nothing else. + Would help internal tree-diff in rev-list as well. + +* daemon --strict-symlink. + +* daemon --no-user-dir, to make ~user still work with + --base-path. They ought to be independent. + +* daemon --base-path does not apply automatically to whitelist + somehow feels wrong. If somebody cares enough, accept + patches. + +* Perhaps detect cloning request in upload-pack and cache the + result for next cloning request until any of our refs change. * Perhaps accept patch to optionally allow '--fuzz' in - 'git-apply'. + 'git-apply'. am/applymbox is _not_ the place to do it. * Allow 'git apply' to accept GNU diff 2.7 output that forgets to say '\No newline' if both input ends with incomplete lines. -* Maybe grok PGP signed text/plain in applymbox as well. - -* Enhance "git repack" to not always use --all; this would be - handy if the repository contains wagging heads like "pu" in - git.git repository. +* Perhaps deal with "Files differ" (binary diff) in non C + locales. -* Make rebase restartable; instead of skipping what cannot be - automatically forward ported, leave the conflicts in the work - tree, have the user resolve it, and then restart from where it - left off [DONE]. +* Maybe grok PGP signed text/plain in applymbox as well. * Output full path in the "git-rev-list --objects" output, not just the basename, and see the improved clustering results in better packing [Tried, but did not work out well]. -* Updated git-changes-script Jeff Garzik needs [Not needed -- - pull into local or borrow temporarily with alternate object - directories environment variable and use normal tools]. - -* Customizable init-db. Personally I think template mechanism - is good enough. Otherwise, maybe add hooks/post-init-db. - -* Make sure we do reasonable thing on binary files even in - cherry-pick and rebase [DONE]. - -* Binary diff detection fails if locale set to non English; even - GNU diff 2.8.1 and 2.8.7 in C locale say different things. At - least run diff under C locale (setenv LANG=C LC_ALL=C) for - 1.0. It might be better to have our own binary detection - logic, or even our own diff output without forking an external - diff. [The former _might_ make sense for 1.0, but the latter - is post 1.0]. - Technical (trivial) ------------------- -* Stop installing the old-name symlinks [DONE]. - -* 'git merge-projects'? - - Subject: Re: Merges without bases - References: <1125004228.4110.20.camel@localhost.localdomain> - Date: Thu, 25 Aug 2005 15:26:36 -0700 - Message-ID: <7vvf1tps9v.fsf@assigned-by-dhcp.cox.net> - -* 'git lost-and-found'? Link dangling commits found by - fsck-objects under $GIT_DIR/refs/lost-found/. Then - show-branch or gitk can be used to find any lost commit. - [DONE] - - Do not name it /lost+found/; that would probably confuse - things that mistake it a mount point (not our code but - somebody else's). +* s/naked/bare/g. -* Add simple globbing rules to git-show-branch so that I can - say 'git show-branch --heads "ko-*"' (ko-master, ko-pu, and - ko-rc are in refs/tags/). +* git-proxy should be spawned with sh -c 'command' $1 $2. -* We would want test scripts for the relative directory path - stuff Linus has been working on. Most of the C-level - commands should be usable with relative directory paths. +* test scripts for the relative directory path stuff. -* In a freashly created empty repository, `git fetch foo:bar` +* In a freshly created empty repository, `git fetch foo:bar` works OK, but `git checkout bar` afterwards does not (missing `.git/HEAD`).