From ff9d22a66a47a9f5bb68f503bec0eec60c57c29c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 5 Aug 2008 21:44:16 -0700 Subject: [PATCH] What's cooking (2008/07 #03) --- whats-cooking.txt | 284 +++++++++++++++++++--------------------------- 1 file changed, 119 insertions(+), 165 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 93ca0b044a..c646f43d62 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,6 +1,6 @@ -Subject: What's cooking in git.git (Jul 2008, issue #02; Sun, 06) +Subject: What's cooking in git.git (Jul 2008, issue #03; Mon, 07) -What's cooking in git.git (Jul 2008, issue #02; Sun, 06) +What's cooking in git.git (Jul 2008, issue #03; Mon, 07) -------------------------------------------------------- Here are the topics that have been cooking. Commits prefixed @@ -47,81 +47,31 @@ 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 +* jc/rebase-orig-head (Mon Jul 7 00:16:38 2008 -0700) 1 commit + + Teach "am" and "rebase" to mark the original position with + ORIG_HEAD -This will eventually appear in 'maint'; currently parked on 'pu', thoug= -h. +* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits + . Migrate git-am to use git-sequencer + . Add git-sequencer test suite (t3350) + . Add git-sequencer prototype documentation + . Add git-sequencer shell prototype -* 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" +* js/pick-root (Fri Jul 4 16:19:52 2008 +0100) 1 commit + + Allow cherry-picking root commits -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 +* ab/bundle (Sat Jul 5 17:26:40 2008 -0400) 1 commit + + Teach git-bundle to read revision arguments from stdin like git- + rev-list. ---------------------------------------------------------------- [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 (Wed Jul 2 15:28:22 2008 -0700) 2 commits +* js/apply-root (Sun Jul 6 18:36:01 2008 -0700) 3 commits + + git-apply --directory: make --root more similar to GNU diff + 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 @@ -132,36 +82,75 @@ 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. +* jk/pager-config (Thu Jul 3 07:46:57 2008 -0400) 1 commit + + Allow per-command pager config ---------------------------------------------------------------- [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 +* 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. + +* am/stash-branch (Mon Jul 7 02:50:10 2008 +0530) 2 commits + + Add a test for "git stash branch" + + 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. + +* 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. + +* 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. + +* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits + + Make "subtree" part more orthogonal to the rest of merge- + recursive. + + Teach git-pull to pass -X