From de2be69c2405f865c4b255cf4a2a172ba861b066 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 20 Jul 2008 22:58:59 -0700 Subject: [PATCH] What's cooking in git.git (Jul 2008, issue #02; Sun, 06) --- whatscooking.txt | 424 +++++++++++++++++++---------------------------- 1 file changed, 169 insertions(+), 255 deletions(-) diff --git a/whatscooking.txt b/whatscooking.txt index abdef9ceb8..52e94cf978 100644 --- a/whatscooking.txt +++ b/whatscooking.txt @@ -1,4 +1,4 @@ -What's cooking in git.git (Jul 2008, issue #01; Tue, 01) +What's cooking in git.git (Jul 2008, issue #02; Sun, 06) -------------------------------------------------------- Here are the topics that have been cooking. Commits prefixed @@ -16,7 +16,7 @@ already bug-free --- that is what cooking them in 'next' is for) and ar= e good set of feature enhancements. Bigger changes will be: - * MinGW will be in. + * Port for MinGW. * With the default Makefile settings, most of the programs will be installed outside your $PATH, except for "git", "gitk", "git-gui" an= @@ -45,17 +45,143 @@ n ---------------------------------------------------------------- [New Topics] +* js/maint-daemon-syslog (Thu Jul 3 16:27:24 2008 +0100) 1 commit + - [PARKED improvement suggested not rolled in] git daemon: avoid + calling syslog() from a signal handler + +This will eventually appear in 'maint'; currently parked on 'pu', thoug= +h. + +* jc/report-tracking (Sun Jul 6 02:54:56 2008 -0700) 5 commits + - branch -r -v: do not spit out garbage + + stat_tracking_info(): clear object flags used during counting + + git-branch -v: show the remote tracking statistics + + git-status: show the remote tracking statistics + + Refactor "tracking statistics" code used by "git checkout" + +Makes the "your branch is ahead of the tracked one by N commits" logic = +and +messages available to other commands; status and branch are updated. + +* sg/stash-k-i (Fri Jun 27 16:37:15 2008 +0200) 1 commit + - stash: introduce 'stash save --keep-index' option + +One weakness of our "partial commit" workflow support used to be that t= +he +user can incrementally build what is to be committed in the index but t= +hat +state cannot be tested as a whole in the working tree. This allows you= + to +temporarily stash the remaining changes in the working tree so that the +index state before running "stash save --keep-index" can be seen in the +working tree to be tested and then committed. A recommended workflow t= +o +use after that commit is made needs to be documented (and support needs= + to +be added if necessary). + +* tr/add-i-e (Thu Jul 3 00:00:00 2008 +0200) 3 commits + + git-add--interactive: manual hunk editing mode + + git-add--interactive: remove hunk coalescing + + git-add--interactive: replace hunk recounting with apply --recount + +Adds 'e/dit' action to interactive add command. + +* am/stash-branch (Thu Jul 3 11:46:05 2008 +0530) 1 commit + + Implement "git stash branch " + +Creates a new branch out of the stashed state, after returning from the +interrupt that forced you to create the stash in the first place. + +* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit + - Ignore graft during object transfer [broken wrt shallow clones] + +Cloning or fetching from a repository from grafts did not send objects +that are hidden by grafts, but the commits in the resulting repository = +do +need these to pass fsck. This fixes object transfer to ignore grafts. + +Another fix is needed to git-prune so that it ignores grafts but treats +commits that are mentioned in grafts as reachable. + +* jk/pager-config (Thu Jul 3 07:46:57 2008 -0400) 1 commit + - Allow per-command pager config + +---------------------------------------------------------------- +[Will merge to master soon] + * js/import-zip (Mon Jun 30 19:50:44 2008 +0100) 1 commit + Add another fast-import example, this time for .zip files -* js/apply-root (Tue Jul 1 00:44:47 2008 +0100) 1 commit +* js/apply-root (Wed Jul 2 15:28:22 2008 -0700) 2 commits + + apply --root: thinkofix. + Teach "git apply" to prepend a prefix with "--root=3D" * db/no-git-config (Mon Jun 30 03:37:47 2008 -0400) 1 commit + Only use GIT_CONFIG in "git config", not other programs +* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits + + Make default expiration period of reflog used for stash infinite + + Per-ref reflog expiry configuration + +As 1.6.0 will be a good time to make backward incompatible changes, the +tip commit makes the default expiry period of stash 'never', unless you +configure them to expire explicitly using gc.refs/stash.* variables. +Needs consensus, but I am guessing that enough people would want stash +that does not expire. + +* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits + + Eliminate an unnecessary chdir("..") + + Add support for GIT_CEILING_DIRECTORIES + + Fold test-absolute-path into test-path-utils + + Implement normalize_absolute_path + +This still feels "because we can", not "because we need to", but it cam= +e +from somebody who had the need to, and I do not think it hurts people +without the environment variable set. + +* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits + + rerere.autoupdate + + t4200: fix rerere test + + rerere: remove dubious "tail_optimization" + + git-rerere: detect unparsable conflicts + + rerere: rerere_created_at() and has_resolution() abstraction + +A new configuration will allow paths that have been resolved cleanly by +rerere to be updated in the index automatically. + +To me, this is "because we can", but was something requested by Ingo, s= +o +presumably some people may feel it useful in their workflow. + ---------------------------------------------------------------- -[Will merge to master soon] +[Actively Cooking] + +* mv/merge-in-c (Tue Jul 1 04:37:50 2008 +0200) 15 commits + - [REJECT -- over-abuse of path-list] Build in merge + + Fix t7601-merge-pull-config.sh on AIX + + git-commit-tree: make it usable from other builtins + + Add new test case to ensure git-merge prepends the custom merge + message + + Add new test case to ensure git-merge reduces octopus parents when + possible + + Introduce reduce_heads() + + Introduce get_merge_bases_many() + + Add new test to ensure git-merge handles more than 25 refs. + + Introduce get_octopus_merge_bases() in commit.c + + git-fmt-merge-msg: make it usable from other builtins + + Move read_cache_unmerged() to read-cache.c + + Add new test to ensure git-merge handles pull.twohead and + pull.octopus + + Move parse-options's skip_prefix() to git-compat-util.h + + Move commit_list_count() to commit.c + + Move split_cmdline() to alias.c + +The last one is still not quite there, I am afraid. + +---------------------------------------------------------------- +[Graduated to "master"] * j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 38 commits + compat/pread.c: Add a forward declaration to fix a warning @@ -105,204 +231,6 @@ n + Compile some programs only conditionally. + Add compat/regex.[ch] and compat/fnmatch.[ch]. -No explanation necessary ;-) - ----------------------------------------------------------------- -[Actively Cooking] - -* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits - - Make default expiration period of reflog used for stash infinite - - Per-ref reflog expiry configuration - -As 1.6.0 will be a good time to make backward incompatible changes, the -tip commit makes the default expiry period of stash 'never', unless you -configure them to expire explicitly using gc.refs/stash.* variables. -Needs consensus, but I am guessing that enough people would want stash -that does not expire. - -We may want to change the commit topology used to represent a stash, as -proposed in $gmane/85055 by Nana earlier. - -* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 4 commits - - Make "subtree" part more orthogonal to the rest of merge- - recursive. - + Teach git-merge to pass -X