X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=TODO;h=0d86e47d6c3772347088a80abaa4ddade3d2b72f;hb=8e6f38443e97e150cd946d508104cad16fdd6bbe;hp=b5cbe4846b117fdd5fb769e23918f10129fcbe49;hpb=c118bd1ed23ad102ccfdce9ffd54e9d3b053708c;p=git.git diff --git a/TODO b/TODO index b5cbe484..0d86e47d 100644 --- a/TODO +++ b/TODO @@ -1,182 +1,145 @@ -What to expect after 0.99.5 -=========================== +The GIT To-Do File +================== -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 -myself. People interested in seeing it materialize please take -a hint. + The latest copy of this document is found at + http://kernel.org/git/?p=git/git.git;a=blob;hb=todo;f=TODO -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. +What to expect from now on +========================== -* Link howto docs from the git.txt page. [DONE] +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 +myself. People interested in seeing it materialize please take +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 ;-). -* Update the SubmittingPatches document to add MUA specific - hints on how to disable unwanted MIME and flowed-text by - collecting past list postings [DONE]. Accept patches from - people who were hit by shiny blue bat to update the same [IN - PROGRESS]. -* 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. +UI +-- -* Review the existing docs and see if the repository - organization needs to be clarified further [STILL NEEDSWORK]. +* Make "git branch -d foo" while on foo branch suggest "maybe + you want to go back to 'master'?" -* Update tutorial to cover shared repository style a bit more - [DONE], maybe with a toy project that involves two or three - repositories. -* Update tutorial to cover setting up repository hooks to do - common tasks. [IN PROGRESS] +Design issues +------------- -* Get help to properly use asciidoc in tutorial [Heck, ended up - learning it myself, DONE]. +* "intent to add" index entries? -* Maybe justify and demonstrate an Octopus in the tutorial - [STILL NEEDSWORK]. Add it to the glossary [Thanks Johannes, - DONE]. +* 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? -Technical (heavier) -------------------- +* Make 'format-patch' take revision limiters similar to + rev-list. For example: -* Tony Luck reported an unfortunate glitch in the 3-way merge. - Encourage discussions to come up with a not-so-expensive way - to catch the kind of ambiguities that led to his misery. - [STARTED TESTING PATCH FROM DANIEL] + A C + ....---x---o---o---x---o---o + / + / + / + ....---x---o---o + B -* We might want to optimize cloning with GIT native transport - not to explode the pack, and store it in objects/pack instead. - We would need a tool to generate an idx file out of a pack - file for this. Also this itself may turn out to be a bad - idea, making the set of packs in repositories everybody has - different from each other. + we should be able to format commits 'o', without duplicates, + by: -* Maybe a pack optimizer. I am not convinced that packing all - objects into a single pack and removing all the existing panck - is the right way to go, since that would work against people - who already have those packs. + $ git format-patch ^A ^B C + Currently the closest approximation is -Technical (milder) ------------------- + $ git format-patch A..C B..C -* When the branch head pointed by $GIT_DIR/HEAD changes while - the index file and working tree are looking the other way - (e.g. somebody pushed into your repository, or you ran "git - fetch" to update the ref your working tree is on), "git - checkout" without -f gets confused. Figure out a good way to - handle this. [DONE] + which results in the last two commits including C formatted + twice. - We still have the same issue with "git fetch". Fetching into - the branch one is on _may_ need to do the same thing as - fetching into anonymous head and then do the resolve. At - least it needs a warning. [DONE] -* "git commit -m" should work for initial commits and perhaps - merge commits as well. Warning about merge is still a good - thing to do, while -m is useful in scripted non-interactive - use, so we need to be careful. [DONE] +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: ] -* Encourage concrete proposals to commit log message templates - we discussed some time ago. +* Maybe a pack optimizer. -* Bug Ryan and work with him to update send-email easier to use. - [Resurrected it for Debian build.] + Given a set of objects and a set of refs (probably a handful + branch heads and point release tags), find a set of packs to + allow reasonably minimum download for all of these classes of + people: (1) somebody cloning the repository from scratch, (2) + somebody who tends to follow the master branch head reasonably + closely, (3) somebody who tends to follow only the point + releases. -* Look at portability fixes from Jason Riedy + This needs a matching smart on the dumb protocol downloader. - http://www.cs.berkeley.edu/~ejr/gits/git.git#portable - [Applied. Burned by one of them and backed out, but otherwise - looks OK.] +Technical (milder) +------------------ -* Accept patches to cause "read-tree -u" delete a directory when - it makes it empty. +* Shallow clones. -* Perhaps accept patches to introduce the concept of "patch flow - expressed as ref mappings" Josef has been advocating about. +* Encourage competition between annotate vs blame. Maybe come + up with some nontrivial test cases. -* Perhaps accept patches to do undo/redo. +* Subprojects. I think the "bind commit" approach has been + outlined at sufficiently detailed level. Maybe find time to + actually start prototyping it? -* MIMEified applymbox to grok B and Q encodings in headers and - turn them into UTF-8; unwrap QP; explode multipart. - [DONE. waiting for a bug to happen ;-) ] + <7vacdzkww3.fsf@assigned-by-dhcp.cox.net> -* "git cherry-pick" that applies the patch an existing commit - introduces in its ancestry chain, possibly using the 3-way - merge machinery. [DONE] +* 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. -* Update rebase using the cherry-pick command. [DONE] + <43CC695E.2020506@codeweavers.com> -* Redo "git revert" using 3-way merge machinery. [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 this does not feel quite right. -* A tool to detect, show and prune already merged topic - branches. + <20060114021800.4688.qmail@web31803.mail.mud.yahoo.com> -* Set up an automated documentation rebuilding procedure at - kernel.org, using update hook mechanism. [DONE] Describe it - in a howto form [DONE]. +* 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. -* Enhance "git repack" to not always use --all; this would be - handy if the repository contains wagging heads like "pu" in - git.git repository. +* daemon --strict-symlink. -* Accept and apply "git repack --all" patch, except the part - that removes the existing packs. [DONE] +* daemon --base-path does not apply automatically to whitelist + somehow feels wrong. If somebody cares enough, accept + patches. -* Internally split the project into non-doc and doc parts; add - an extra root for the doc part and merge from it; move the - internal doc source to a separate repository, like the +Meta - repository; experiment if this results in a reasonable - workflow, and document it in howto form if it does. +* Perhaps detect cloning request in upload-pack and cache the + result for next cloning request until any of our refs change. -* Add names to all nodes in show-branch [DONE]. +* Perhaps deal with "Files differ" (binary diff) in non C + locales. -* Option to limit rename detection for more than N paths. +* Maybe grok PGP signed text/plain in applymbox as well. Technical (trivial) ------------------- -* Look at and merge Debian fixes from Tommi [Done]. - -* Perhaps "git branch -d" to delete a branch. - -* Remove "git clone-dumb-http". - -* We would want test scripts for the relative directory path - stuff Linus has been working on. So far, the following - commands should be usable with relative directory paths: - - update-cache - ls-files - diff-files - diff-cache - diff-tree - rev-list - - -Initial repository Gotchas --------------------------- - -* `git fetch foo:bar` works OK, but `git checkout bar` - afterwards does not (missing `.git/HEAD`) - -* `git commit -s` did not add signoff for initial commit [DONE]. +* git-proxy should be spawned with sh -c 'command' $1 $2. -* `git status` does not work well when missing `.git/HEAD` [DONE]. +* test scripts for the relative directory path stuff. -* `git log` either; git-log-script uses die which does not exist - [DONE]. +* In a freshly created empty repository, `git fetch foo:bar` + works OK, but `git checkout bar` afterwards does not (missing + `.git/HEAD`). Local Variables: