Tool Renames Plan
=================
- - 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.
+ - Immedately after 0.99.9, the backward compatible symbolic
+ links in $(bindir) will be removed [DONE].
- - 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.
+ git-ssh-push and git-ssh-pull pair is not going away if ever.
+ Each of these old-name commands continues to invoke its
+ old-name counterpart on the other end.
- 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.
+ - There was a discussion to move bulk of the git-* programs out
+ of /usr/bin and use /usr/lib/git; the central mechanism was
+ done, but the actual move is postponed post 1.0.
- The timeframe for this is around Oct 1st.
-
-What to expect after 0.99.7
+What to expect after 0.99.9
===========================
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
-------------
+* Help Jon Loeliger to find place in the documentation to place
+ his drawing [DONE].
+
* 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.
-
* 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).
* Maybe update tutorial with a toy project that involves two or
- three developers..
-
-* Document octopus [Linus prodded me again; DONE].
+ three developers.
* Update tutorial to cover setting up repository hooks to do
common tasks.
-* Accept patches to finish missing docs.
+* Do we still have missing docs? If so accept patches to finish
+ them.
* Accept patches to talk about "Whoops, it broke. What's
- next?".
+ next?" [Started].
* Accept patches to make formatted tables in asciidoc to work
well in both html and man pages (see git-diff(1)).
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.
+* Assess the side effects of "make the rest of the things
+ magically work from any subdirectory" change by Linus. It is
+ a good change in principle and we would like to have that
+ behaviour but some tool implementations I am sure are assuming
+ to never run from anywhere other than the top. [Post 1.0]
+
+* Ref namespace management. Perhaps use refs/local/ suggestion
+ by Linus.
+
+* Git daemon, when deployed at kernel.org, might turn out to be
+ quite a burden, since it needs to generate customized packs
+ every time a new request comes in. It may be worthwhile to
+ precompute some packs for popular sets of heads downloaders
+ have and serve that, even if that could give more than the
+ client asks for in some cases. We will know about this soon
+ enough [DONE part to allow using precomputed pack, but not
+ dynamic caching part].
* 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>; Post
+ 1.0].
* 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.
+
* Maybe an Emacs VC backend.
* 'git split-projects'? This requires updated 'git-rev-list' to
Message-ID: <Pine.LNX.4.63.0509221617300.23242@iabervon.org>
* Look at libified GNU diff CVS seems to use, or libxdiff.
+ [Daniel has his own diff tool almost ready to start
+ integrating and testing; Post 1.0]
+
+* Plug-in file-level merges [Post 1.0].
Technical (milder)
------------------
-* Use 'git-update-ref' in the scripts.
+* Binary package split. Plan laid out and discussion mostly
+ done. [RPM side done; Debian side delegated]
+
+* User-relative paths by Andreas Ericsson. [Need to ping]
-* Use symbolic refs in .git/HEAD. Should we do that everywhere
- while honoring the symlinked HEAD in the existing repositories
- for backward compatibility, or just only when 'ln -s' fails?
+* Proxing git:// connection by Paul Collins. [Need to ping]
-* 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 [DONE].
+* Maybe look at Cogito and see if I can help Pasky to adjust to
+ the later core features?
-* 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].
+* Perhaps detect cloning request in upload-pack and cache the
+ result for next cloning request until any of our refs change.
* Encourage concrete proposals to commit log message templates
we discussed some time ago.
-* Accept patches for more portability.
-
- * strcasestr() in mailinfo. We may need compat/strcasestr.c;
- this is bugging OpenBSD folks [DONE, thanks to Linus and
- others].
-
- * Solaris portability [ONGOING, thanks to Patrick Mauritz,
- Peter Eriksen and Sean from sympatico].
-
-* Accept patches to cause "read-tree -u" delete a directory when
- it makes it empty.
-
-* Perhaps accept patches to introduce the concept of "patch flow
- expressed as ref mappings" Josef has been advocating about.
-
* Perhaps accept patches to do undo/redo.
* Perhaps accept patch to optionally allow '--fuzz' in
* Maybe grok PGP signed text/plain in applymbox as well.
-* 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.
-
* Enhance "git repack" to not always use --all; this would be
handy if the repository contains wagging heads like "pu" in
git.git repository.
-* 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.
-
* 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.
+ left off [mechanism DONE; in pu].
* 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].
-* Remove obsolete commands [DONE].
+* Updated git-changes-script Jeff Garzik needs [Inquiry for
+ external spec sent out with a quick hack. Will know if that
+ is what he needs hopefully soon].
-* Option to limit rename detection for more than N paths [DONE].
+* Make sure we do reasonable thing on binary files even in
+ cherry-pick and rebase. [mechanism DONE; rebase in pu]
-* Option to show only status and name from diff [DONE].
-
-* What to name the 'master' version between 0.99.7 and 0.99.8
- and still not break binary distribution folks? 0.99.7z?
- Pasky gave me a good one: 0.99.7.GIT [DONE]
-
-* Listing more than one head on the Pull: line of .git/remotes/
- allows you to make Octopus -- is it useful? Probabaly not.
- Either adopt "only the first head is used for the merge by
- default if taken from .git/remotes/ file", or "list heads to
- merge on a separate Merge: line" proposal. I already have the
- code to do the former, so...
+* Customizable init-db. Personally I think template mechanism
+ is good enough. Otherwise, maybe add hooks/post-init-db.
Technical (trivial)
-------------------
-* Usher SSL enhancements to http-fetch from Nick Hengeveld into
- a shape acceptable by everybody.
-
-* Require tk 2.4 in the spec file.
-
-* show-branch naming heads is buggy [DONE].
-
* Stop installing the old-name symlinks [DONE].
* 'git merge-projects'?
-* 'git clone' does not check things out. Should it?
+ Subject: Re: Merges without bases
+ References: <1125004228.4110.20.camel@localhost.localdomain>
+ Date: Thu, 25 Aug 2005 15:26:36 -0700
+ Message-ID: <7vvf1tps9v.fsf@assigned-by-dhcp.cox.net>
* '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-<.]
+ show-branch or gitk can be used to find any lost commit.
+ [DONE]
Do not name it /lost+found/; that would probably confuse
things that mistake it a mount point (not our code but
projects / git.git / blobdiff