http://kernel.org/git/?p=git/git.git;a=blob;hb=todo;f=TODO
-Tool Renames Plan
-=================
+What to expect from now on
+==========================
- - In 0.99.7, all renamed commands have symbolic links in
- $(bindir) so that old names continue to work. These backward
- compatible names will not appear in documentation. The main
- documentation, git(7) will talk about the new names but would
- mention their old names as historical notes. Old environment
- names defined in gitenv() will also be removed in this release.
+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 ;-).
- - In 0.99.8, we will not install these backward compatible
- symbolic links in $(bindir) anymore. The Makefile will have
- a target to remove old symlinks from $(DESTDIR)$(bindir) you
- can run manually to help you clean things up.
- As a notable exception, git-ssh-push and git-ssh-pull pair is
- not going away within this timeframe, if ever. Each of these
- old-name commands continues to invoke its old-name
- counterpart on the other end. Updating to 0.99.8 on one end
- of the connection does not requier the other end to update at
- the same time.
+Documentation
+-------------
+
+* No pending issues at the moment. "Revamp Tutorial" initiative
+ by Bruce Fields ongoing and things are looking better.
- The timeframe for this is around Oct 1st.
+UI
+--
-What to expect after 0.99.7
-===========================
+* Make "git branch -d foo" while on foo branch suggest "maybe
+ you want to go back to 'master'?"
-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.
+* Error message from "git checkout -b bar v2.6.10" should assume
+ v2.6.10 is an attempt to switch to a new branch based on
+ mistyped tag, not an attempt to revert path v2.6.10 from the
+ HEAD commit with extra "make and switch to this branch"
+ argument.
+* "git commit [-i|-o] paths..." with misspelled paths would be
+ silently ignored. Add a flag to ls-files to catch unmatched
+ pathspec to prevent this.
-Documentation
+
+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.
+* 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.
-* Accept patches from people who were hit by shiny blue bat to
- update the SubmittingPatches.
+* 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
-* Document octopus [Linus prodded me again; DONE].
+ we should be able to format commits 'o', without duplicates,
+ by:
-* Update tutorial to cover setting up repository hooks to do
- common tasks.
+ $ git format-patch ^A ^B C
-* Accept patches to finish missing docs.
+ Currently the closest approximation is
-* Accept patches to talk about "Whoops, it broke. What's
- next?".
+ $ git format-patch A..C B..C
-* Accept patches to make formatted tables in asciidoc to work
- well in both html and man pages (see git-diff(1)).
+ 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.
- [Deathmatch between Daniel's and Fredrik's ongoing.]
-
-* 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. Linus,
- me, and Daniel outlined a smarter merge strategy for this.
- Try them out.
-
-* 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.
-
* Libification. There are many places "run once" mentality is
ingrained in the management of basic data structures, which
- need to be fixed.
+ need to be fixed. [Matthias Urlichs is already working on
+ this: <pan.2005.10.03.20.48.52.132570@smurf.noris.de>]
* Maybe a pack optimizer.
-* Maybe an Emacs VC backend.
+ 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.
-* 'git split-projects'? This requires updated 'git-rev-list' to
- skip irrelevant commits.
- Message-ID: <Pine.LNX.4.63.0509221617300.23242@iabervon.org>
+ This needs a matching smart on the dumb protocol downloader.
-* Look at libified GNU diff CVS seems to use.
+* 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]
Technical (milder)
------------------
-* Revisit 'git-merge'. It probably was a mistake to "loop to
- choose the best one", since what is best is not ill defined to
- begin with. This would make it a lot straightforward to
- loosen the tree cleanliness requirements to the acceptable
- level.
+* "git status -v" to give commit preview.
-* The recent commit walker safety patch may be too cautious and
- appears to take forever when cloning. This may even be
- infinitely looping in the code lifted from the old rev-list --
- needs to be taken a look at [DONE -- and redone very nicely by
- Sergey].
+* Subprojects. I think the "bind commit" approach has been
+ outlined at sufficiently detailed level. Maybe find time to
+ actually start prototyping it?
-* Encourage concrete proposals to commit log message templates
- we discussed some time ago.
+ <7vacdzkww3.fsf@assigned-by-dhcp.cox.net>
-* Accept patches for more portability.
+* Shallow clones.
- * strcasestr() in mailinfo. We may need compat/strcasestr.c;
- this is bugging OpenBSD folks [DONE, thanks to Linus and
- others].
+* Mark entries as "assume unchanged" in the index.
- * Solaris portability [ONGOING, thanks to Patrick Mauritz,
- Peter Eriksen and Sean from sympatico].
+ <Pine.LNX.4.64.0601311807470.7301@g5.osdl.org>
-* Accept patches to cause "read-tree -u" delete a directory when
- it makes it empty.
+ A config item '[core] trust_stat = false' would cause to:
-* Perhaps accept patches to introduce the concept of "patch flow
- expressed as ref mappings" Josef has been advocating about.
+ - "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?
-* Perhaps accept patches to do undo/redo.
-
-* Perhaps accept patch to optionally allow '--fuzz' in
- 'git-apply'.
+ - checkout-index -u would mark the path and makes the working
+ tree file read-only.
-* Allow 'git apply' to accept GNU diff 2.7 output that forgets
- to say '\No newline' if both input ends with incomplete
- lines.
+ - read-tree without -u would mark the path invalid.
-* Maybe grok PGP signed text/plain in applymbox as well.
+ - update-index --refresh should *not* mark up-to-date paths valid.
-* Perhaps a tool to revert a single file to pre-modification
- state? People with BK background know this operation as
- 'clean'. 'git checkout [-f] ent [path...]' was suggested by
- Matthias Urlichs which sounds a natural extention to what the
- command currently does.
+ Impacts to various commands:
-* Enhance "git repack" to not always use --all; this would be
- handy if the repository contains wagging heads like "pu" in
- git.git repository.
+ - update-index --refresh would ignore them.
-* 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.
+ - diff-files would say unchanged.
-* 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.
+ - diff-index without --cached acts the same way as diff-index
+ --cached.
-* 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].
+* 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.
-* Remove obsolete commands [DONE].
+ <43CC695E.2020506@codeweavers.com>
-* Option to limit rename detection for more than N paths [READY].
+* 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.
-* Option to show only status and name from diff [READY].
+ <20060114021800.4688.qmail@web31803.mail.mud.yahoo.com>
-* What to name the 'master' version between 0.99.7 and 0.99.8
- and still not break binary distribution folks? 0.99.7z?
+* Perhaps a smarter HTTP anonymous download via CGI.
+* 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.
-Technical (trivial)
--------------------
+* daemon --strict-symlink.
-* show-branch naming heads is buggy.
+* daemon --base-path does not apply automatically to whitelist
+ somehow feels wrong. If somebody cares enough, accept
+ patches.
- git show-branch --more=2
- ! [linus] Input: check switch bitmap when matching handlers
- * [master] Input: check switch bitmap when matching handlers
- --
- ++ [linus] Input: check switch bitmap when matching handlers
- ++ [linus~1] Merge branch 'upstream' from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
- ++ [linus^2] Merge /spare/repo/linux-2.6/
+* Perhaps detect cloning request in upload-pack and cache the
+ result for next cloning request until any of our refs change.
- The last one should be linus~2 or something; linus head does
- not have three parents!
+* Perhaps accept patch to optionally allow '--fuzz' in
+ 'git-apply'. am/applymbox is _not_ the place to do it.
-* Stop installing the old-name symlinks.
+* Allow 'git apply' to accept GNU diff 2.7 output that forgets
+ to say '\No newline' if both input ends with incomplete
+ lines.
-* 'git add --recursive' [DONE]
+* Perhaps deal with "Files differ" (binary diff) in non C
+ locales.
-* 'git merge-projects'?
+* Maybe grok PGP signed text/plain in applymbox as well.
-* '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. [A
- feeler patch sent out. Very underwhelming response X-<.]
+* 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].
- Do not name it /lost+found/; that would probably confuse
- things that mistake it a mount point (not our code but
- somebody else's).
-* 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/).
+Technical (trivial)
+-------------------
-* 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:
+* git-proxy should be spawned with sh -c 'command' $1 $2.
- git-update-index
- git-ls-files
- git-diff-files
- git-diff-index
- git-diff-tree
- git-rev-list
- git-rev-parse
+* 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`).