From b84a0297fe67e116bf904bfc0da497529fe73c2a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 23 Feb 2011 15:25:48 -0800 Subject: [PATCH] What's cooking (2011/02 #05) --- whats-cooking.txt | 427 +++++++++++++++++++++++++++++----------------- 1 file changed, 269 insertions(+), 158 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 69b7b587de..8577eb019e 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,110 +1,194 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Feb 2011, #04; Wed, 16) -X-master-at: 5673d695fcce217b26d1a5956c1184ff62dc74f1 -X-next-at: a71843abac0d3679ef8ee8e818795c39d1910e44 +Subject: What's cooking in git.git (Feb 2011, #05; Wed, 23) +X-master-at: 046613c5465e4fc0611f93a5ef31d3815fb50c22 +X-next-at: 426d48db1a78ffd5f2b882725c32f266e617529e -What's cooking in git.git (Feb 2011, #04; Wed, 16) +What's cooking in git.git (Feb 2011, #05; Wed, 23) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' while commits prefixed with '+' are in 'next'. -The 'maint' branch has accumulated enough minor fixes to produce 1.7.4.1, -perhaps by the end of this week. - -------------------------------------------------- [New Topics] -* jh/do-not-track-non-branches (2011-02-16) 1 commit +* ab/i18n (2011-02-22) 73 commits + - i18n: git-shortlog basic messages + - i18n: git-revert split up "could not revert/apply" message + - i18n: git-revert literal "me" messages + - i18n: git-revert "Your local changes" message + - i18n: git-revert basic messages + - i18n: git-notes GIT_NOTES_REWRITE_MODE error message + - i18n: git-notes basic commands + - i18n: git-gc "Auto packing the repository" message + - i18n: git-gc basic messages + - i18n: git-describe basic messages + - i18n: git-clean clean.requireForce messages + - i18n: git-clean basic messages + - i18n: git-bundle basic messages + - i18n: git-archive basic messages + - i18n: git-status "renamed: " message + - i18n: git-status "Initial commit" message + - i18n: git-status "Changes to be committed" message + - i18n: git-status shortstatus messages + - i18n: git-status "nothing to commit" messages + - i18n: git-status basic messages + - i18n: git-push "prevent you from losing" message + - i18n: git-push basic messages + - i18n: git-tag tag_template message + - i18n: git-tag basic messages + - i18n: git-reset "Unstaged changes after reset" message + - i18n: git-reset reset_type_names messages + - i18n: git-reset basic messages + - i18n: git-rm basic messages + - i18n: git-mv "bad" messages + - i18n: git-mv basic messages + - i18n: git-merge "Wonderful" message + - i18n: git-merge "You have not concluded your merge" messages + - i18n: git-merge "Updating %s..%s" message + - i18n: git-merge basic messages + - i18n: git-log "--OPT does not make sense" messages + - i18n: git-log basic messages + - i18n: git-grep "--open-files-in-pager" message + - i18n: git-grep basic messages + - i18n: git-fetch split up "(non-fast-forward)" message + - i18n: git-fetch update_local_ref messages + - i18n: git-fetch formatting messages + - i18n: git-fetch basic messages + - i18n: git-diff basic messages + - i18n: git-commit advice messages + - i18n: git-commit "enter the commit message" message + - i18n: git-commit print_summary messages + - i18n: git-commit formatting messages + - i18n: git-commit "middle of a merge" message + - i18n: git-commit basic messages + - i18n: git-checkout "Switched to a .. branch" message + - i18n: git-checkout "HEAD is now at" message + - i18n: git-checkout describe_detached_head messages + - i18n: git-checkout: our/their version message + - i18n: git-checkout basic messages + - i18n: git-branch "(no branch)" message + - i18n: git-branch "git branch -v" messages + - i18n: git-branch "Deleted branch [...]" message + - i18n: git-branch "remote branch '%s' not found" message + - i18n: git-branch basic messages + - i18n: git-add "Unstaged changes" message + - i18n: git-add "remove '%s'" message + - i18n: git-add "did not match any files" message + - i18n: git-add "The following paths are ignored" message + - i18n: git-add basic messages + - i18n: git-clone "Cloning into" message + - i18n: git-clone "Cloning into" message + - i18n: git-clone basic messages + - i18n: git-init "Initialized [...] repository" message + - i18n: git-init basic messages + - i18n: Makefile: "pot" target to extract messages marked for translation + - i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set + - i18n: add GETTEXT_POISON to simulate translated messages unfriendly translator + - i18n: add no-op _() and N_() wrappers + +Re^4-roll, coordinated between Ævar and Jonathan. + +I'd like to fast-track the basics (especially the bottom 3 patches), and +am even tempted to rebase other patches on 'pu' that are not yet in 'next' +on top of them, to make the transition easier, so please lend extra sets +of eyeballs on an earlier ones to make sure they are sane (I thought they +were, but I am far from perfect). + +* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit + - Look for password in both CVS and CVSNT password files. + +* jc/checkout-orphan-warning (2011-02-18) 1 commit + - commit: give final warning when reattaching HEAD to leave commits behind + +Likes, dislikes? + +* jh/maint-do-not-track-non-branches (2011-02-17) 1 commit - branch/checkout --track: Ensure that upstream branch is indeed a branch -Conflicts with tr/maint-branch-no-track-head but we should probably say -that this supersedes it. +This supersedes "do not track HEAD" from Thomas. -* jh/push-default-upstream-configname (2011-02-16) 1 commit - - push.default: Rename 'tracking' to 'upstream' +* jk/diffstat-binary (2011-02-19) 2 commits + (merged to 'next' on 2011-02-23 at 49da967) + + diff: don't retrieve binary blobs for diffstat + + diff: handle diffstat of rewritten binary files -This is not "renaming" in the sense that breaks existing practice, but -giving a new official name and deprecating the existing one. +* jk/fail-null-clone (2011-02-17) 1 commit + (merged to 'next' on 2011-02-23 at a4217f5) + + clone: die when trying to clone missing local path -* js/maint-merge-use-prepare-commit-msg-hook (2011-02-14) 1 commit - - merge: honor prepare-commit-msg hook +* jk/merge-rename-ux (2011-02-20) 6 commits + - pull: propagate --progress to merge + - merge: enable progress reporting for rename detection + - add inexact rename detection progress infrastructure + - commit: stop setting rename limit + - bump rename limit defaults (again) + - merge: improve inexact rename limit warning -Will merge to 'next'. +The above three all seemed sensible improvements. -* mg/patch-id (2011-02-16) 2 commits - - git-patch-id: do not trip over "no newline" markers - - git-patch-id: test for "no newline" markers +* jn/test-terminal-punt-on-osx-breakage (2011-02-17) 1 commit + (merged to 'next' on 2011-02-23 at d754139) + + tests: skip terminal output tests on OS X -The tip one is too strict in determining "\ No newline..." that needs to -be loosened to be in line with what "git apply" does. +* js/cherry-pick-usability (2011-02-19) 4 commits + (merged to 'next' on 2011-02-23 at 95db30e) + + Teach commit about CHERRY_PICK_HEAD + + bash: teach __git_ps1 about CHERRY_PICK_HEAD + + Introduce CHERRY_PICK_HEAD + + t3507: introduce pristine-detach helper -* mg/placeholders-are-lowercase (2011-02-15) 4 commits - - Make lowercase as per CodingGuidelines - - Make lowercase as per CodingGuidelines - - Make lowercase as per CodingGuidelines - - CodingGuidelines: downcase placeholders in usage messages +* js/detach-doc (2011-02-20) 1 commit + (merged to 'next' on 2011-02-21 at c384c3c) + + git-checkout.txt: improve detached HEAD documentation -Will merge to 'next'. +* lt/rename-no-extra-copy-detection (2011-02-18) 3 commits + (merged to 'next' on 2011-02-23 at 2c1f271) + + diffcore-rename: improve estimate_similarity() heuristics + + diffcore-rename: properly honor the difference between -M and -C + + for_each_hash: allow passing a 'void *data' pointer to callback -* mo/perl-bidi-pipe-envfix (2011-02-15) 1 commit - (merged to 'next' on 2011-02-15 at c36e816) - + perl: command_bidi_pipe() method should set-up git environmens +* mg/rev-list-one-side-only (2011-02-22) 6 commits + - t6007: test rev-list --cherry + - log --cherry: a synonym + - rev-list: --left/right-only are mutually exclusive + - rev-list: documentation and test for --left/right-only + - t6007: Make sure we test --cherry-pick + - revlist.c: introduce --left/right-only for unsymmetric picking -Looked reasonable. +* so/submodule-no-update-first-time (2011-02-17) 2 commits + (merged to 'next' on 2011-02-23 at 2c6e8c9) + + t7406: "git submodule update {--merge|--rebase]" with new submodules + + submodule: no [--merge|--rebase] when newly cloned -* nd/sorted-builtin-command-list (2011-02-15) 1 commit - - git.c: reorder builtin command list +* va/p4 (2011-02-20) 2 commits + (merged to 'next' on 2011-02-21 at d981b23) + + git-p4: Add copy detection support + + git-p4: Improve rename detection support -Looked Ok and low impact. Will merge to 'next'. +* jc/complete-symmetric-diff (2011-02-23) 1 commit + - completion: complete "git diff ...branc" -* sp/maint-smart-http-sans-100-continue (2011-02-15) 1 commit - (merged to 'next' on 2011-02-15 at 553e3e5) - + smart-http: Don't use Expect: 100-Continue +* jh/submodule-fetch-on-demand (2011-02-23) 6 commits + - submodule update: Don't fetch when the submodule commit is already present + - fetch/pull: Don't recurse into a submodule when commits are already present + - Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option + - config: teach the fetch.recurseSubmodules option the 'on-demand' value + - fetch/pull: Add the 'on-demand' value to the --recurse-submodules option + - fetch/pull: recurse into submodules when necessary -* jc/grep--no-index-pathspec-fix (2011-02-16) 1 commit - - grep --no-index: honor pathspecs correctly - (this branch uses nd/struct-pathspec; is tangled with en/object-list-with-pathspec.) +* jk/format-patch-multiline-header (2011-02-23) 2 commits + - format-patch: wrap long header lines + - strbuf: add fixed-length version of add_wrapped_text + +* cp/mergetool-beyondcompare (2011-02-18) 1 commit + - mergetool--lib: add support for beyond compare + +May want to have an independent success report on Windows. -------------------------------------------------- [Stalled] -* pw/p4 (2011-02-05) 8 commits - - git-p4: support clone --bare - - git-p4: decode p4 wildcard characters - - git-p4: better message for "git-p4 sync" when not cloned - - git-p4: reinterpret confusing p4 message - - git-p4: accommodate new move/delete type in p4 - - git-p4: add missing newline in initial import message - - git-p4: fix key error for p4 problem - - git-p4: test script - -Will be re-rolled after collecting comments (Pete Wyckoff, 2011-02-07). - -* js/checkout-untracked-symlink (2011-02-05) 2 commits - . (weatherbaloon) needs in-code explanation updates - . Demonstrate breakage: checkout overwrites untracked symlink with directory - -The "fix" seems to test t6035, #2. - -Will discard the following topics carried over since pre-1.7.4 era. - -* nd/index-doc (2010-09-06) 1 commit - - doc: technical details about the index file format - -Half-written but it is a good start. I may need to give some help in -describing more recent index extensions. - -* cb/ignored-paths-are-precious (2010-08-21) 1 commit - - checkout/merge: optionally fail operation when ignored files need to be overwritten - -This needs tests; also we know of longstanding bugs in related area that -needs to be addressed---they do not have to be part of this series but -their reproduction recipe would belong to the test script for this topic. - -It would hurt users to make the new feature on by default, especially the -ones with subdirectories that come and go. - * jk/tag-contains (2010-07-05) 4 commits - Why is "git tag --contains" so slow? - default core.clockskew variable to one day @@ -117,66 +201,112 @@ builtin/tag.c to make it clear that it should not be used outside the current usage context. * jc/rename-degrade-cc-to-c (2011-01-06) 3 commits - - diffcore-rename: fall back to -C when -C -C busts the rename limit - - diffcore-rename: record filepair for rename src - - diffcore-rename: refactor "too many candidates" logic + . diffcore-rename: fall back to -C when -C -C busts the rename limit + . diffcore-rename: record filepair for rename src + . diffcore-rename: refactor "too many candidates" logic -IIRC, this was a weather-baloon "if you wanted to, this may be how you -would do it" without test updates. People who care need to help moving -things forward. - -* ab/p4 (2011-01-11) 1 commit - - git-p4: correct indenting and formatting - -Lacks sign-off. There are a few topics in the same area discussed among -Pete Wyckoff, Vitor Antunes and Tor Arvid Lund that I won't be picking up -myself before the dust settles, so I'd discard this soonish, and wait for -the resolution of the other topics. - -* tr/maint-branch-no-track-head (2010-12-14) 1 commit - - branch: do not attempt to track HEAD implicitly - -See jh/do-not-track-non-branches topic. +* nd/index-doc (2010-09-06) 1 commit + . doc: technical details about the index file format -------------------------------------------------- [Cooking] +* js/checkout-untracked-symlink (2011-02-20) 2 commits + (merged to 'next' on 2011-02-23 at 52a35ce) + + do not overwrite untracked symlinks + + Demonstrate breakage: checkout overwrites untracked symlink with directory + +* pw/p4 (2011-02-19) 8 commits + (merged to 'next' on 2011-02-21 at 1a7b7d2) + + git-p4: support clone --bare + + git-p4: decode p4 wildcard characters + + git-p4: better message for "git-p4 sync" when not cloned + + git-p4: reinterpret confusing p4 message + + git-p4: accommodate new move/delete type in p4 + + git-p4: add missing newline in initial import message + + git-p4: fix key error for p4 problem + + git-p4: test script + +* jh/push-default-upstream-configname (2011-02-16) 1 commit + (merged to 'next' on 2011-02-23 at b5c25fa) + + push.default: Rename 'tracking' to 'upstream' + +This is not "renaming" in the sense that breaks existing practice, but +giving a new official name and deprecating the existing one. + +* js/maint-merge-use-prepare-commit-msg-hook (2011-02-14) 1 commit + (merged to 'next' on 2011-02-22 at 6458c4b) + + merge: honor prepare-commit-msg hook + +* mg/patch-id (2011-02-17) 2 commits + (merged to 'next' on 2011-02-22 at 6f4acd8) + + git-patch-id: do not trip over "no newline" markers + + git-patch-id: test for "no newline" markers + +* mg/placeholders-are-lowercase (2011-02-17) 5 commits + (merged to 'next' on 2011-02-22 at 2754e21) + + Make lowercase in Documentation + + Make lowercase as per CodingGuidelines + + Make lowercase as per CodingGuidelines + + Make lowercase as per CodingGuidelines + + CodingGuidelines: downcase placeholders in usage messages + +* mo/perl-bidi-pipe-envfix (2011-02-15) 1 commit + (merged to 'next' on 2011-02-15 at c36e816) + + perl: command_bidi_pipe() method should set-up git environmens + +Looked reasonable. + +* nd/sorted-builtin-command-list (2011-02-15) 1 commit + (merged to 'next' on 2011-02-22 at 91fccd1) + + git.c: reorder builtin command list + +* sp/maint-smart-http-sans-100-continue (2011-02-15) 1 commit + (merged to 'next' on 2011-02-15 at 553e3e5) + + smart-http: Don't use Expect: 100-Continue + +* jc/grep--no-index-pathspec-fix (2011-02-16) 1 commit + (merged to 'next' on 2011-02-23 at 58b03b1) + + grep --no-index: honor pathspecs correctly + (this branch uses nd/struct-pathspec; is tangled with en/object-list-with-pathspec.) + * mz/rebase (2011-02-09) 32 commits - - rebase: use @{upstream} if no upstream specified - - rebase -i: remove unnecessary state rebase-root - - rebase -i: don't read unused variable preserve_merges - - git-rebase--am: remove unnecessary --3way option - - rebase -m: don't print exit code 2 when merge fails - - rebase -m: remember allow_rerere_autoupdate option - - rebase: remember strategy and strategy options - - rebase: remember verbose option - - rebase: extract code for writing basic state - - rebase: factor out sub command handling - - rebase: make -v a tiny bit more verbose - - rebase -i: align variable names - - rebase: show consistent conflict resolution hint - - rebase: extract am code to new source file - - rebase: extract merge code to new source file - - rebase: remove $branch as synonym for $orig_head - - rebase -i: support --stat - - rebase: factor out call to pre-rebase hook - - rebase: factor out clean work tree check - - rebase: factor out reference parsing - - rebase: reorder validation steps - - rebase -i: remove now unnecessary directory checks - - rebase: factor out command line option processing - - rebase: align variable content - - rebase: align variable names - - rebase: stricter check of standalone sub command - - rebase: act on command line outside parsing loop - - rebase: improve detection of rebase in progress - - rebase: remove unused rebase state 'prev_head' - - rebase: read state outside loop - - rebase: refactor reading of state - - rebase: clearer names for directory variables + (merged to 'next' on 2011-02-22 at 3219155) + + rebase: use @{upstream} if no upstream specified + + rebase -i: remove unnecessary state rebase-root + + rebase -i: don't read unused variable preserve_merges + + git-rebase--am: remove unnecessary --3way option + + rebase -m: don't print exit code 2 when merge fails + + rebase -m: remember allow_rerere_autoupdate option + + rebase: remember strategy and strategy options + + rebase: remember verbose option + + rebase: extract code for writing basic state + + rebase: factor out sub command handling + + rebase: make -v a tiny bit more verbose + + rebase -i: align variable names + + rebase: show consistent conflict resolution hint + + rebase: extract am code to new source file + + rebase: extract merge code to new source file + + rebase: remove $branch as synonym for $orig_head + + rebase -i: support --stat + + rebase: factor out call to pre-rebase hook + + rebase: factor out clean work tree check + + rebase: factor out reference parsing + + rebase: reorder validation steps + + rebase -i: remove now unnecessary directory checks + + rebase: factor out command line option processing + + rebase: align variable content + + rebase: align variable names + + rebase: stricter check of standalone sub command + + rebase: act on command line outside parsing loop + + rebase: improve detection of rebase in progress + + rebase: remove unused rebase state 'prev_head' + + rebase: read state outside loop + + rebase: refactor reading of state + + rebase: clearer names for directory variables Minor UI regression was reported but otherwise it looked like that the -topic is in a good shape. Will merge to 'next'. +topic is in a good shape. * jh/merge-sans-branch (2011-02-10) 4 commits . merge: add support for merging from upstream by default @@ -187,24 +317,21 @@ topic is in a good shape. Will merge to 'next'. There was an objection to the tip one that determines the upstream in a wrong way? -* lp/config-vername-check (2011-02-10) 4 commits - - Fix-up detection of configuration key without section or variable - - Disallow empty section and variable names - - Fix-up configuration variable name parsing - - Sanity-check config variable names - -Will merge to 'next' but the two "Fix-up"s should be squashed in first. +* lp/config-vername-check (2011-02-01) 2 commits + (merged to 'next' on 2011-02-23 at 426d48d) + + Disallow empty section and variable names + + Sanity-check config variable names * mz/rerere-remaining (2011-02-16) 2 commits - - mergetool: don't skip modify/remove conflicts - - rerere "remaining" + (merged to 'next' on 2011-02-22 at fa2d5ab) + + mergetool: don't skip modify/remove conflicts + + rerere "remaining" -Looked much better than my weatherbaloon patch. Will merge to 'next'. +Looked much better than my weatherbaloon patch. * nd/hash-object-sanity (2011-02-05) 1 commit - - Make hash-object more robust against malformed objects - -Should be low-impact enough. Will merge to 'next'. + (merged to 'next' on 2011-02-22 at 09acf6f) + + Make hash-object more robust against malformed objects * hv/mingw-fs-funnies (2011-02-07) 5 commits (merged to 'next' on 2011-02-09 at 3d0bb1a) @@ -258,19 +385,3 @@ Rerolled and seems ready to move forward. + checkout: fix bug with ambiguous refs The topic has become about "checkout --detach" ;-). - --------------------------------------------------- -[Discarded] - -* jc/rerere-remaining (2011-01-06) 1 commit - . rerere "remaining" - -Just a handful of weatherballoon patches without proper tests, in response -to feature/minor fix requests. - -* ab/i18n (2010-10-07) 161 commits - . po/de.po: complete German translation - .... - . t7004-tag.sh: re-arrange git tag comment for clarity - -Will be re-rolled.