-What to expect after 0.99.6
-===========================
+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.
+* Take the updated tutorial by Bruce Fields very seriously. It
+ is a quite good initiative.
-* Accept patches from people who were hit by shiny blue bat to
- update the SubmittingPatches [ONGOING].
-* 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).
+Design issues
+-------------
+
+* 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.
-* Maybe update tutorial with a toy project that involves two or
- three developers..
+* Doing a merge in a separate directory.
-* Update tutorial to cover setting up repository hooks to do
- common tasks.
+* Subprojects. I think the "bind commit" approach has been
+ outlined at sufficiently detailed level. Maybe find time to
+ actually start prototyping it?
-* Accept patches to finish missing docs.
+ <7vacdzkww3.fsf@assigned-by-dhcp.cox.net>
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.
- [Daniel's patch looks quite promising, so is the one from
- Fredrik.]
-
-* 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 [Outlined the idea; just do it].
-
-* 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 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.
+
+ 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]
+
Technical (milder)
------------------
-* Tool renames [STARTED].
+* 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.
-* Have Daniel's read-tree graduate from "pu" after plugging leaks.
+ <43CC695E.2020506@codeweavers.com>
-* Implement a merge backend using Daniel's read-tree.
+* 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 does not feel quite right.
-* 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.
+ <20060114021800.4688.qmail@web31803.mail.mud.yahoo.com>
-* Encourage concrete proposals to commit log message templates
- we discussed some time ago.
+* Perhaps a smarter HTTP anonymous download via CGI.
-* Bug Martin for archimport script documentation.
+* Prepare to enable "always use symbolic refs for HEAD" patch.
+ We need a timeline to force Porcelains to get ready. All the
+ major ones should be ready now.
-* More portability. I dropped a SunOS patch on the floor by
- somebody.
+* Prepare to enable "most of the things are installed in
+ GIT_EXEC_PATH not in bindir". I do not plan to set bindir !=
+ gitexecdir myself in the main Makefile I ship, but distos
+ should be able to choose to do so.
-* Accept patches to cause "read-tree -u" delete a directory when
- it makes it empty.
+* Forbid/ignore pack names that do not conform to the convention
+ sha1_pack_name() assumes and reject in check_packed_git_idx()
+ [In "pu"]
-* Perhaps accept patches to introduce the concept of "patch flow
- expressed as ref mappings" Josef has been advocating about.
+* Any Porcelain-ish we forgot or punted to make usable from
+ subdirectory? I think the last pass caught everything and
+ what are remaining are whole-tree or whole repository
+ operations.
-* Perhaps accept patches to do undo/redo.
+* 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.
-* Maybe grok PGP signed text/plain in applymbox as well.
+* daemon --strict-symlink.
+
+* daemon --no-user-dir, to make ~user still work with
+ --base-path. They ought to be independent.
-* 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.
+* daemon --base-path does not apply automatically to whitelist
+ somehow feels wrong. If somebody cares enough, accept
+ patches.
-* A tool to detect, show and prune already merged topic
- branches.
+* Perhaps detect cloning request in upload-pack and cache the
+ result for next cloning request until any of our refs change.
-* Enhance "git repack" to not always use --all; this would be
- handy if the repository contains wagging heads like "pu" in
- git.git repository.
+* Perhaps accept patch to optionally allow '--fuzz' in
+ 'git-apply'. am/applymbox is _not_ the place to do it.
-* 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.
+* 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.
-* Option to limit rename detection for more than N paths.
+* 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)
-------------------
-* Perhaps "git branch -d" to delete a branch.
+* s/naked/bare/g.
-* 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.
- update-cache
- ls-files
- diff-files
- diff-cache
- diff-tree
- rev-list
- 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`).