X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=TODO;h=73ab4c63ab4bce732f6f2fc093a3b5f59c0b118c;hb=cc68633578c1c7f23fe249731a90eff94f17fda2;hp=eafbbce5e80821efd57bf38f2d96a07d8bda45aa;hpb=e6e947f5de840b64e5547006b6660c4dcef6d31e;p=git.git diff --git a/TODO b/TODO index eafbbce5..73ab4c63 100644 --- a/TODO +++ b/TODO @@ -6,8 +6,8 @@ The GIT To-Do File http://kernel.org/git/?p=git/git.git;a=blob;hb=todo;f=TODO -What to expect until and after 1.0 -================================== +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 @@ -16,39 +16,52 @@ a hint. Also whatever I marked "Perhaps" do not have to happen if ever -- only if somebody cares enough and submits a clean patch, perhaps ;-). -Only handful things remain until 1.0. - Documentation ------------- -* 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. +* No pending issues at the moment. "Revamp Tutorial" initiative + by Bruce Fields ongoing and things are looking better. + + +Design issues +------------- + +* Rehash "git commit" with various parameters to be more + intuitive without breaking traditinal users too much. We need + to phase this in, especially if we are going to change "git + commit" to imply the current "git commit -a" behaviour. + +* "intent to add" index entries. + +* 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. + +* Doing a merge in a separate directory. -* 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). +* Make 'format-patch' take revision limiters similar to + rev-list. For example: -* Maybe update tutorial with a toy project that involves two or - three developers. + A C + ....---x---o---o---x---o---o + / + / + / + ....---x---o---o + B -* Update tutorial to cover setting up repository hooks to do - common tasks [Mostly done, with Carl's help]. + we should be able to format commits 'o', without duplicates, + by: -* Do we still have missing docs? If so accept patches to finish - them. + $ git format-patch ^A ^B C -* Accept patches to talk about "Whoops, it broke. What's - next?" [I think this is done]. + Currently the closest approximation is -* Accept patches to make formatted tables in asciidoc to work - well in both html and man pages (see git-diff(1)) [DONE -- - avoid them ;-)]. + $ git format-patch A..C B..C -* Work around multiple synopses lines in manual pages - (e.g. git-bisect) [DONE -- avoid them ;-)]. + which results in the last two commits including C formatted + twice. Technical (heavier) @@ -57,8 +70,7 @@ 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. @@ -71,67 +83,100 @@ Technical (heavier) releases. This needs a matching smart on the dumb protocol downloader. - [Definitely post 1.0]. * 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]. On the other hand, we - may not even need this; just tell people to run "xxdiff -U" on - the working tree files. - -* Ref namespace management. Perhaps use refs/local/ suggestion - by Linus. [Does not seem to be high on people's priority list, - and not interested myself. People can resurrect this - discussion if they want.] + integrating and testing] Technical (milder) ------------------ -* strip leading directory from ls-tree output, to match ls-files - output. +* Subprojects. I think the "bind commit" approach has been + outlined at sufficiently detailed level. Maybe find time to + actually start prototyping it? + + <7vacdzkww3.fsf@assigned-by-dhcp.cox.net> + +* Shallow clones. + +* Mark entries as "assume unchanged" in the index. + New option to update-index to set or drop the bit is needed. + + - update-index --no-stat paths... + - update-index --with-stat paths... + + Also a config item '[core] trust_stat = false' would enable + this automatically: - I am of two minds about this one. diff output must always be - -p1 format no matter where the command was started, and - ls-tree might be easier to use if it matched diff, not - ls-files. + - "update-index" with or without --add would mark the path + after registering. Should we make the working tree file + read-only at this point? + + - checkout-index -u would mark the path and makes the working + tree file read-only. + + Impacts to various commands: + + - update-index --refresh would ignore them. + + - diff-files would say unchanged. + + - diff-index without --cached acts the same way as diff-index + --cached. + +* 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. + + <43CC695E.2020506@codeweavers.com> + +* 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 this does not feel quite right. + + <20060114021800.4688.qmail@web31803.mail.mud.yahoo.com> + +* Perhaps a smarter HTTP anonymous download via CGI. + +* 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. * 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 [can be post - 1.0]. + Would help internal tree-diff in rev-list as well. -* 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. Alternatively, update-index needs to - give it a way to construct higher stages [DONE using the - "alternatively" implementation]. +* daemon --strict-symlink. -* daemon --strict-symlink [can be post 1.0]. +* daemon --no-user-dir, to make ~user still work with + --base-path. They ought to be independent. -* Binary package split. Plan laid out and discussion mostly - done. [RPM side done; Debian side thrown over the wall.] +* 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. +* Perhaps deal with "Files differ" (binary diff) in non C + locales. -* Enhance "git repack" to not always use --all; this would be - handy if the repository contains wagging heads like "pu" in - git.git repository. +* 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 @@ -141,11 +186,13 @@ Technical (milder) Technical (trivial) ------------------- -* 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. +* Use parent info in 'diff-tree --stdin'. + +* git-proxy should be spawned with sh -c 'command' $1 $2. + +* 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`).