X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=TODO;h=0d86e47d6c3772347088a80abaa4ddade3d2b72f;hb=8e6f38443e97e150cd946d508104cad16fdd6bbe;hp=62020893988b141c4a4088c109fa65898812e13d;hpb=52dd75885cd3a78dcb3d7f4f0ddf16f4b8f62b56;p=git.git diff --git a/TODO b/TODO index 62020893..0d86e47d 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 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,38 +16,47 @@ 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. +UI +-- -Documentation +* Make "git branch -d foo" while on foo branch suggest "maybe + you want to go back to 'master'?" + + +Design issues ------------- -* 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. +* "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. + 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?" [ONGOING]. + 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)). + $ git format-patch A..C B..C -* Work around multiple synopses lines in manual pages - (e.g. git-bisect). + which results in the last two commits including C formatted + twice. Technical (heavier) @@ -56,8 +65,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,73 +79,65 @@ Technical (heavier) This needs a matching smart on the dumb protocol downloader. -* 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] +Technical (milder) +------------------ -* 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. +* Shallow clones. -* 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.] +* Encourage competition between annotate vs blame. Maybe come + up with some nontrivial test cases. +* Subprojects. I think the "bind commit" approach has been + outlined at sufficiently detailed level. Maybe find time to + actually start prototyping it? -Technical (milder) ------------------- + <7vacdzkww3.fsf@assigned-by-dhcp.cox.net> -* strip leading directory from ls-tree output. +* 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> * 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]. - -* 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 [can be post 1.0, but - nicer to have in 1.0]. + Would help internal tree-diff in rev-list as well. -* daemon --strict-symlink [can be post 1.0]. +* daemon --strict-symlink. -* 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'. - -* Allow 'git apply' to accept GNU diff 2.7 output that forgets - to say '\No newline' if both input ends with incomplete - lines. +* Perhaps deal with "Files differ" (binary diff) in non C + locales. * 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. - -* 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]. - 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. +* 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`).