-What to expect after 0.99.5
-===========================
+The GIT To-Do File
+==================
+
+ The latest copy of this document is found at
+
+ http://kernel.org/git/?p=git/git.git;a=blob;hb=todo;f=TODO
+
+
+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
myself. People interested in seeing it materialize please take
-a hint.
+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 ;-).
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.
-* Link howto docs from the git.txt page. [DONE]
-* Update the SubmittingPatches document to add MUA specific
- hints on how to disable unwanted MIME and flowed-text by
- collecting past list postings [DONE].
+Design issues
+-------------
-* Accept patches from people who were hit by shiny blue bat to
- update the SubmittingPatches [ONGOING].
+* 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.
-* 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).
+* "intent to add" index entries.
-* Review the existing docs and see if the repository
- organization needs to be clarified further [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.
-* Update tutorial to cover shared repository style a bit more
- [DONE].
+* Doing a merge in a separate directory.
-* Maybe update tutorial with a toy project that involves two or
- three developers..
+* Make 'format-patch' take revision limiters similar to
+ rev-list. For example:
-* Document the hooks [DONE].
+ 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:
-* Get help to properly use asciidoc in tutorial [Heck, ended up
- learning it myself, DONE].
+ $ git format-patch ^A ^B C
-* Maybe justify and demonstrate an Octopus in the tutorial
- [STILL NEEDSWORK].
+ Currently the closest approximation is
-* Add Octopus to the glossary [Thanks Johannes, DONE].
+ $ git format-patch A..C B..C
+
+ which results in the last two commits including C formatted
+ twice.
Technical (heavier)
-------------------
-* 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]
-
-* HPA has two projects, klibc and klibc-kbuild, that have large
- set of overlapping files in different paths (i.e. one has many
- renames from the other). There currently is no way for git to
- help keep these two trees in sync, merging criss-cross between
- them. The merge logic should be able to take advantage of
- rename/copy detection smarts git-diff-* family has.
-
-* 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.
-
-* 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.
+* 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: <pan.2005.10.03.20.48.52.132570@smurf.noris.de>]
-* Maybe an Emacs VC backend.
+* Maybe a pack optimizer.
+ 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.
-Technical (milder)
-------------------
+ This needs a matching smart on the dumb protocol downloader.
-* 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]
+* Maybe an Emacs VC backend.
-* 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]
+* Look at libified GNU diff CVS seems to use, or libxdiff.
+ [Daniel has his own diff tool almost ready to start
+ integrating and testing]
-* "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]
-* Encourage concrete proposals to commit log message templates
- we discussed some time ago.
+Technical (milder)
+------------------
-* Test apply.c patches from Robert Fitzsmons and have them
- graduate to "master" branch.
+* "git status -v" to give commit preview.
-* Bug Ryan and work with him to update send-email easier to use.
- [Resurrected it for Debian build.]
+* Subprojects. I think the "bind commit" approach has been
+ outlined at sufficiently detailed level. Maybe find time to
+ actually start prototyping it?
-* Look at portability fixes from Jason Riedy
+ <7vacdzkww3.fsf@assigned-by-dhcp.cox.net>
- http://www.cs.berkeley.edu/~ejr/gits/git.git#portable
+* Shallow clones.
- [Applied. Burned by one of them and backed out, but otherwise
- looks OK.]
+* Mark entries as "assume unchanged" in the index.
-* Accept patches to cause "read-tree -u" delete a directory when
- it makes it empty.
+ <Pine.LNX.4.64.0601311807470.7301@g5.osdl.org>
-* Perhaps accept patches to introduce the concept of "patch flow
- expressed as ref mappings" Josef has been advocating about.
+ A config item '[core] trust_stat = false' would cause to:
-* Perhaps accept patches to do undo/redo.
+ - "update-index" with or without --add would mark the path
+ valid after registering. Should we make the working tree
+ file read-only at this point?
-* 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 ;-) ]
+ - checkout-index -u would mark the path and makes the working
+ tree file read-only.
-* Maybe grok PGP signed text/plain in applymbox as well.
+ - read-tree without -u would mark the path invalid.
-* Perhaps a tool to revert a single file to pre-modification
- state? git-cat-file blob `git-ls-files | grep foo` >foo or
- git-cat-file blob `git-ls-tree HEAD foo` >foo? What should
- the command be called? git-revert is taken so is
- git-checkout.
+ - update-index --refresh should *not* mark up-to-date paths valid.
-* "git cherry-pick" that applies the patch an existing commit
- introduces in its ancestry chain, possibly using the 3-way
- merge machinery. [DONE]
+ Impacts to various commands:
-* Update rebase using the cherry-pick command. [DONE]
+ - update-index --refresh would ignore them.
-* Redo "git revert" using 3-way merge machinery. [DONE]
+ - diff-files would say unchanged.
-* A tool to detect, show and prune already merged topic
- branches.
+ - diff-index without --cached acts the same way as diff-index
+ --cached.
-* Set up an automated documentation rebuilding procedure at
- kernel.org, using update hook mechanism. [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.
-* Describe automated documentation rebuilding in a howto form
- [DONE].
+ <43CC695E.2020506@codeweavers.com>
-* Enhance "git repack" to not always use --all; this would be
- handy if the repository contains wagging heads like "pu" in
- git.git repository.
+* 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.
-* Accept and apply "git repack --all" patch, except the part
- that removes the existing packs. [DONE]
+ <20060114021800.4688.qmail@web31803.mail.mud.yahoo.com>
-* 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 a smarter HTTP anonymous download via CGI.
-* Add names to all nodes in show-branch [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.
-* Option to limit rename detection for more than N paths.
+* daemon --strict-symlink.
+* daemon --base-path does not apply automatically to whitelist
+ somehow feels wrong. If somebody cares enough, accept
+ patches.
-Technical (trivial)
--------------------
+* Perhaps detect cloning request in upload-pack and cache the
+ result for next cloning request until any of our refs change.
-* Look at and merge Debian fixes from Tommi [Done].
+* Perhaps accept patch to optionally allow '--fuzz' in
+ 'git-apply'. am/applymbox is _not_ the place to do it.
-* Perhaps "git branch -d" to delete a branch.
+* Allow 'git apply' to accept GNU diff 2.7 output that forgets
+ to say '\No newline' if both input ends with incomplete
+ lines.
-* Remove "git clone-dumb-http".
+* Perhaps deal with "Files differ" (binary diff) in non C
+ locales.
-* 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:
+* Maybe grok PGP signed text/plain in applymbox as well.
- update-cache
- ls-files
- diff-files
- diff-cache
- diff-tree
- rev-list
+* 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].
-Initial repository Gotchas
---------------------------
+Technical (trivial)
+-------------------
-* `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`).
\f
Local Variables: