To: git@vger.kernel.org
-Subject: What's cooking in git.git (Mar 2011, #04; Wed, 23)
-X-master-at: cd3065f9e3c27594a91540e971d147f1acba89de
-X-next-at: 46300131fe1c0c8ebcb394416c551a5f8fa38342
+Subject: What's cooking in git.git (Mar 2011, #05; Sun, 27)
+X-master-at: be919d50c08fbe3a0653d6ba778b73f4940705ca
+X-next-at: be8b495e51e5bd78849a4c79633fcb93d3959a48
-What's cooking in git.git (Mar 2011, #04; Wed, 23)
+What's cooking in git.git (Mar 2011, #05; Sun, 27)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'.
-I notice that there are too many stalled topics, for which only the
-"finishing touches" are the missing pieces. These new "features" and
-"usability" that were discussed, tried, and then abandoned are things that
-we survived without so far, so in that sense I do not see very strong need
-for me to step in and clean them up alone, losing my beauty sleep time.
-
-But it is a shame to see all the discussions and efforts go to waste when
-we are this (shows the thumb and the index finger almost touching)
-close. Discussing new features may be more fun, but please, people, let's
-start wrapping things up for this cycle.
-
--------------------------------------------------
[New Topics]
-* jc/diff-dotdot (2011-03-23) 2 commits
- - warn use of "git diff A..B"
- - diff: remove dead code that flips arguments order
+* jc/merge-sans-branch (2011-03-23) 2 commits
+ - merge: merge with the default upstream branch without argument
+ - merge: match the help text with the documentation
-This is 1/4 tongue-in-cheek but mostly serious.
+Allow running "git merge" without telling it what to merge. It will merge
+with the "upstream" of the current branch if configured.
-* jk/progress-with-pager (2011-03-23) 3 commits
- - show: turn on rename progress
- - progress: use pager's original_stderr if available
- - pager: save the original stderr when redirecting to pager
+* jh/gitweb-localtime (2011-03-23) 1 commit
+ - gitweb: javascript ability to adjust time based on timezone
-The bottom two feel like a right thing to do, but "show" may not be a
-right example.
+* jk/maint-merge-rename-create (2011-03-25) 3 commits
+ - merge: turn on rewrite detection
+ - merge: handle renames with replacement content
+ - t3030: fix accidental success in symlink rename
+
+* jk/pull-into-empty (2011-03-25) 2 commits
+ - pull: do not clobber untracked files on initial pull
+ - merge: merge unborn index before setting ref
+
+* mz/maint-rename-unmerged (2011-03-23) 1 commit
+ - diffcore-rename: don't consider unmerged path as source
+
+* nd/struct-pathspec (2011-03-25) 4 commits
+ - Improve tree_entry_interesting() handling code
+ - Convert read_tree{,_recursive} to support struct pathspec
+ - Reimplement read_tree_recursive() using tree_entry_interesting()
+ - Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'
--------------------------------------------------
[Graduated to "master"]
-* jc/maint-diff-q-filter (2011-03-16) 1 commit
- (merged to 'next' on 2011-03-20 at d3d85dc)
- + diff --quiet: disable optimization when --diff-filter=X is used
+* jc/fetch-progressive-stride (2011-03-20) 3 commits
+ (merged to 'next' on 2011-03-20 at 2917b19)
+ + fetch-pack: use smaller handshake window for initial request
+ + fetch-pack: progressively use larger handshake windows
+ + fetch-pack: factor out hardcoded handshake window size
-* jn/fortify-source-workaround (2011-03-16) 1 commit
- (merged to 'next' on 2011-03-20 at 69c4ceb)
- + run-command: prettify -D_FORTIFY_SOURCE workaround
+* jc/index-update-if-able (2011-03-21) 2 commits
+ (merged to 'next' on 2011-03-23 at e7e071a)
+ + update $GIT_INDEX_FILE when there are racily clean entries
+ + diff/status: refactor opportunistic index update
-* jn/maint-c99-format (2011-03-16) 2 commits
- (merged to 'next' on 2011-03-20 at 65cbc8c)
- + unbreak and eliminate NO_C99_FORMAT
- + mktag: avoid %td in format string
+* jc/maint-rerere-in-workdir (2011-03-10) 1 commit
+ (merged to 'next' on 2011-03-23 at e5ef1a2)
+ + rerere: make sure it works even in a workdir attached to a young repository
-* kc/gitweb-pathinfo-w-anchor (2011-03-18) 1 commit
- (merged to 'next' on 2011-03-20 at 2d65786)
- + gitweb: fix #patchNN anchors when path_info is enabled
+Resurrected, as this was originally written with the explicit goal of
+helping contrib/workdir/git-new-workdir users, and it is good enough to
+only support absolute symbolic links for that purpose.
-* lt/default-abbrev (2011-03-20) 2 commits
- (merged to 'next' on 2011-03-20 at 17ed457)
- + Rename core.abbrevlength back to core.abbrev
- (merged to 'next' on 2011-03-17 at 1d7e406)
- + Make the default abbrev length configurable
+* jk/checkout-orphan-warning (2011-03-20) 3 commits
+ (merged to 'next' on 2011-03-23 at 26adae6)
+ + checkout: tweak detached-orphan warning format
+ + checkout: clear commit marks after detached-orphan check
+ + checkout: add basic tests for detached-orphan warning
-The configuration roughly corresponds to --abbrev command line option, so
-I should rename it back to core.abbrev as Linus originally named it.
-Will merge to 'master'.
+* jp/completion-help-alias (2011-03-21) 1 commit
+ (merged to 'next' on 2011-03-23 at e21fa7b)
+ + git-completion: Add git help completion for aliases
-* pk/stash-apply-status-relative (2011-03-14) 2 commits
- (merged to 'next' on 2011-03-20 at 232b096)
- + Add test: git stash shows status relative to current dir
- + git stash: show status relative to current directory
+* js/remove-unused-variables (2011-03-22) 1 commit
+ (merged to 'next' on 2011-03-23 at 4630013)
+ + Remove unused variables
-* pw/p4 (2011-03-16) 2 commits
- (merged to 'next' on 2011-03-20 at fdad818)
- + git-p4: test sync new branch
- + git-p4: fix sync new branch regression
+* mg/rev-list-n-parents (2011-03-23) 3 commits
+ (merged to 'next' on 2011-03-23 at 8baa059)
+ + rev-list --min-parents,--max-parents: doc, test and completion
+ + revision.c: introduce --min-parents and --max-parents options
+ + t6009: use test_commit() from test-lib.sh
---------------------------------------------------
-[Stalled]
+Rerolled with --no-max-parents and the like.
-* jc/add-u-migration (2011-03-22) 3 commits
- - add: make "add -u/-A" update full tree without pathspec (step 3)
- - add: make "add -u/-A" update full tree without pathspec (step 2)
- - add: make "add -u/-A" update full tree without pathspec
+* nd/index-doc (2011-03-01) 2 commits
+ (merged to 'next' on 2011-03-23 at 316cafc)
+ + doc: technical details about the index file format
+ + doc: technical details about the index file format
-The message in the bottom one really needs proofreading to move this topic
-forward. Of course, perhaps nobody cares enough (even though many people
-seem to have complained about the current behaviour) and we may end up
-discarding this topic. We'll see.
+* ss/git-gui-mergetool (2011-02-26) 2 commits
+ (merged to 'next' on 2011-03-17 at a8fac18)
+ + mergetool--lib: Add Beyond Compare 3 as a tool
+ + mergetool--lib: Sort tools alphabetically for easier lookup
-* jh/merge-sans-branch (2011-02-10) 4 commits
- . merge: add support for merging from upstream by default
- - merge: introduce per-branch-configuration helper function
- - merge: introduce setup_merge_commit helper function
- - merge: update the usage information to be more modern
+Merged through Pat's git-gui tree.
-There was an objection to the tip one that determines the upstream in a
-wrong way? I've been wanting to move this forward for quite some time but
-also hoping somebody else would send in a final version.
+--------------------------------------------------
+[Stalled]
* mz/rebase (2011-02-28) 34 commits
- rebase: define options in OPTIONS_SPEC
--------------------------------------------------
[Cooking]
-* jc/maint-rerere-in-workdir (2011-03-10) 1 commit
- (merged to 'next' on 2011-03-23 at e5ef1a2)
- + rerere: make sure it works even in a workdir attached to a young repository
-
-Resurrected, as this was originally written with the explicit goal of
-helping contrib/workdir/git-new-workdir users, and it is good enough to
-only support absolute symbolic links for that purpose.
-
-* jk/checkout-orphan-warning (2011-03-20) 3 commits
- (merged to 'next' on 2011-03-23 at 26adae6)
- + checkout: tweak detached-orphan warning format
- + checkout: clear commit marks after detached-orphan check
- + checkout: add basic tests for detached-orphan warning
-
-* mg/rev-list-n-parents (2011-03-23) 3 commits
- (merged to 'next' on 2011-03-23 at 8baa059)
- + rev-list --min-parents,--max-parents: doc, test and completion
- + revision.c: introduce --min-parents and --max-parents options
- + t6009: use test_commit() from test-lib.sh
-
-Rerolled with --no-max-parents and the like.
-
-* jc/index-update-if-able (2011-03-21) 2 commits
- (merged to 'next' on 2011-03-23 at e7e071a)
- + update $GIT_INDEX_FILE when there are racily clean entries
- + diff/status: refactor opportunistic index update
+* jc/add-u-migration (2011-03-22) 3 commits
+ - add: make "add -u/-A" update full tree without pathspec (step 3)
+ - add: make "add -u/-A" update full tree without pathspec (step 2)
+ - add: make "add -u/-A" update full tree without pathspec
-* jp/completion-help-alias (2011-03-21) 1 commit
- (merged to 'next' on 2011-03-23 at e21fa7b)
- + git-completion: Add git help completion for aliases
+The message in the bottom one really needs proofreading to move this topic
+forward. Will merge to 'next' the bottom one, hopefully after that.
-* js/remove-unused-variables (2011-03-22) 1 commit
- (merged to 'next' on 2011-03-23 at 4630013)
- + Remove unused variables
+* jk/progress-with-pager (2011-03-24) 4 commits
+ - diff: turn on rename detection progress reporting
+ - show: turn on rename detection progress reporting
+ - progress: use pager's original_stderr if available
+ - pager: save the original stderr when redirecting to pager
* sb/sparse-more (2011-03-21) 1 commit
(merged to 'next' on 2011-03-23 at 4bec1d1)
* cn/system-path-tweak (2011-03-17) 1 commit
- system_path: use a static buffer
-* jc/fetch-progressive-stride (2011-03-20) 3 commits
- (merged to 'next' on 2011-03-20 at 2917b19)
- + fetch-pack: use smaller handshake window for initial request
- + fetch-pack: progressively use larger handshake windows
- + fetch-pack: factor out hardcoded handshake window size
-
* en/merge-recursive (2011-03-17) 4 commits
(merged to 'next' on 2011-03-18 at a32016b)
+ merge-recursive: tweak magic band-aid
+ fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
+ fetch/pull: recurse into submodules when necessary
-* ss/git-gui-mergetool (2011-02-26) 2 commits
- (merged to 'next' on 2011-03-17 at a8fac18)
- + mergetool--lib: Add Beyond Compare 3 as a tool
- + mergetool--lib: Sort tools alphabetically for easier lookup
-
-The CLI side (ss/mergetool--lib topic) will be in the next release, so
-I've pinged Pat to take this into gut-gui tree.
-
-* nd/index-doc (2011-03-01) 2 commits
- (merged to 'next' on 2011-03-23 at 316cafc)
- + doc: technical details about the index file format
- + doc: technical details about the index file format
-
* ab/i18n-st (2011-02-22) 69 commits
(merged to 'next' on 2011-03-23 at e2732e2)
+ i18n: git-shortlog basic messages
+ i18n: git-init basic messages
Now in 'next'.
+
+--------------------------------------------------
+[Discarded]
+
+* jc/diff-dotdot (2011-03-23) 2 commits
+ . warn use of "git diff A..B"
+ . diff: remove dead code that flips arguments order
+
+This is 1/4 tongue-in-cheek. Now we seem to have at least two volunteer
+cluebat bearers, so I wouldn't have to worry about this topic very much.
+
+* jh/merge-sans-branch (2011-02-10) 4 commits
+ . merge: add support for merging from upstream by default
+ - merge: introduce per-branch-configuration helper function
+ - merge: introduce setup_merge_commit helper function
+ - merge: update the usage information to be more modern
+
+I've been wanting to move this forward for quite some time but
+ended up redoing it myself (see jc/merge-sans-branch)
projects / thirdparty / git.git / commitdiff
