-What to expect after 0.99.6
-===========================
+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
+ The latest copy of this document is found at
http://kernel.org/git/?p=git/git.git;a=blob;hb=todo;f=TODO
-Tool Renames Plan
------------------
-
- - All non-binary commands will lose -script suffix in
- $(bindir). The source to git-foo will be either git-foo.sh
- or git-foo.perl in the source tree, and the documentation
- will be in Documentation/git-foo.txt.
-
- - The commands whose names have 'cache' to mean 'index file'
- will get 'cache' in their names replaced with 'index'. For
- git-fsck-cache and git-convert-cache, 'cache' will be
- replaced with 'objects'.
-
- - The commit walkers will have 'pull' in their names replaced
- with 'fetch'. 'git-ssh-push' will become 'git-ssh-upload'.
-
- - We continue to follow the convention to name the C source
- file that contains the main program of 'git-foo' command
- 'foo.c'. That means we will have 'fsck-objects.c', for
- example.
- - At this moment, I am not planning to rename the symbols used
- in programs, nor any library sources. "cache.h" will stay
- "cache.h", so does "read-cache.c". "struct cache_entry" and
- "ce_match_stat()" will keep their names. We _might_ want to
- rename them in later rounds but not right now.
+What to expect from now on
+==========================
- - In 0.99.7, all renamed commands will have symbolic links in
- $(bindir) so that old names continue to work. These backward
- compatible symlinks will not be present in documentation,
- though. Especially, the main documentation, git(7) will talk
- about the new names. Old environment names defined in
- gitenv() will also be removed in this release.
-
- Tentatively we aim to do this on Sep 17th.
-
- - In 0.99.8, we do 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.
-
- The timeframe for this is around Oct 1st, but I could be
- talked into delaying the symlink removal if Porcelain people
- find this schedule too tight.
+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 ;-).
-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.
-
-* Accept patches from people who were hit by shiny blue bat to
- update the SubmittingPatches.
+* tree entries in index? -- sorry, stalled
-* 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).
+* "intent to add" index entries? -- together with the above
+ needs rethinking.
-* Maybe update tutorial with a toy project that involves two or
- three developers..
-
-* Update tutorial to cover setting up repository hooks to do
- common tasks.
-
-* Accept patches to finish missing docs.
+* 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 (or kompare).
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.
-
-* To make it easier to experiment with different merge
- strategies, make git-merge driver that will run merge backends
- for the best merge [DONE].
+* Libification. There are many places "run once" mentality is
+ ingrained in the management of basic data structures, which
+ need to be fixed. [Matthias Urlichs was already working on
+ this: <pan.2005.10.03.20.48.52.132570@smurf.noris.de>, but I
+ do not know what happened to his efforts]
-* 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.
-
-* Maybe an Emacs VC backend.
+* Lazy clones that can be controlled by the user, ranging from
+ totally on-demand a la CVS/SVN to "cache down to this old
+ commit so that I can make full use of git on at least recent
+ history". This need a lot of work in making tools to exit
+ gracefully when they hit unavailable objects while offline.
Technical (milder)
------------------
-* Tool renames. Give fixup patch for at least Cogito and StGIT.
- [As of 2005-09-09 evening US/Pacific, the "master" branch has
- what should go in 0.99.7 including gitenv() removal].
-
-* Have Daniel's read-tree graduate from "pu" after plugging
- leaks [DONE].
+* git grep should be able to omit prefix when invoked from a
+ subdirectory. Either make it an option or default with
+ --full-name like ls-files does.
-* Implement a merge backend using Daniel's read-tree [DONE].
+* duplicated refspec given to "fetch-pack a a a" makes it emit
+ strange error message because it triggers the "match only
+ once" logic. Maybe strip the dups on the input side
+ (Uwe Zeisberger
+ <20060608073857.GA5072@informatik.uni-freiburg.de>).
-* Rename 'git-merge-resolve' to 'git-merge-stupid' and
- 'git-merge-multibase' to 'git-merge-resolve'; the former is
- for historical curiosity and comparison purposes only and not
- to be used in real applications so remove it from the default
- strategies list [DONE].
+* map only parts of huge packfiles and LRU fragments of them.
+ People are starting to try git on projects with deep history
+ and/or many objects, e.g. Mozilla.
-* Accept Fredrik merge after renaming it (I want to name the
- driver 'git merge'). Suggest where to place *.py stuff --
- probably in $(share)/git-core/ and add Makefile entry for
- installation [DONE].
+* upload-pack support for start fetching from any valid point on
+ the history, not just published refs. (Erik W. Biederman
+ <m164jc9ekx.fsf@ebiederm.dsl.xmission.com>)
-* Encourage concrete proposals to commit log message templates
- we discussed some time ago.
+* git-daemon side support for virtual hosting. Client side
+ is ready in 1.4.0 (Jon Loeliger <1149610100.23938.75.camel@cashmere.sps.mot.com>).
-* Bug Martin for archimport script documentation [DONE].
+* teach git-upload-pack not to ack-continue early when the
+ client has roots it does not know about but it already has
+ learned the fork points for all the requested heads
+ (Ralf Baechle <20060524131022.GA11449@linux-mips.org>).
-* More portability [IN PROGRESS].
+* Per user .gitconfig across repositories -- ongoing.
-* Accept patches to cause "read-tree -u" delete a directory when
- it makes it empty.
+* Encourage competition between annotate vs blame. Maybe come
+ up with some nontrivial test cases.
-* Perhaps accept patches to introduce the concept of "patch flow
- expressed as ref mappings" Josef has been advocating about.
+* Subprojects. Try "gitlink" -- sorry, stalled.
-* Perhaps accept patches to do undo/redo.
+* Rebase and checkout -m should be able to use recursive
+ strategy as well. These commands currently do not work across
+ renames.
-* Perhaps accept patch to optionally allow '--fuzz' in
- 'git-apply'.
+* 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.
-* Maybe grok PGP signed text/plain in applymbox as well.
-
-* 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.
-
-* A tool to detect, show and prune already merged topic
- branches.
-
-* "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.
+ <43CC695E.2020506@codeweavers.com>
- Do not name it /lost+found/; that would probably confuse
- things that mistake it a mount point (not our code but
- somebody else's).
+* 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.
-* Enhance "git repack" to not always use --all; this would be
- handy if the repository contains wagging heads like "pu" in
- git.git repository.
+ <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.
+* 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.
-* Marking copy seems to be broken when A,B => B,C rename
- happens; we incorrectly say B stays, which makes the new B
- copy of old A, not rename [DONE].
+* daemon --base-path does not apply automatically to whitelist
+ somehow feels wrong. If somebody cares enough, accept
+ patches.
-* 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.
+* Perhaps detect cloning request in upload-pack and cache the
+ result for next cloning request until any of our refs change.
-* 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].
+* Maybe grok PGP signed text/plain in applymbox as well.
Technical (trivial)
-------------------
-* Teach 'git format-patch' about 'git cherry' [DONE].
-
-* Make 'git bisect' easier to use by logging the earlier
- good/bad choices and make it replayable [DONE].
-
-* Perhaps "git branch -d" to delete a branch. We probably need
- some way to say "delete this branch because everything in this
- should be merged in the master branch" and refuse the removal
- if it is not true.
+* git-proxy should be spawned with sh -c 'command' $1 $2.
-* 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 a true git-proxy command that reads the first request
+ pkt-line, and redirects the request to its real destination.
- 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`).