From 37b0f8876ea3bf73c987bf95fe8d9ea239bfbdbc Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 23 Mar 2011 16:34:51 -0700 Subject: [PATCH] What's cooking (2011/03 #04) --- whats-cooking.txt | 393 ++++++++++++++++++++-------------------------- 1 file changed, 172 insertions(+), 221 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index f4277f1e76..b9faf5fa7b 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,9 +1,9 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Mar 2011, #03; Tue, 22) -X-master-at: 5e839c8f6d5edfaf0d2250f3c9628a238e24c6be -X-next-at: 18336960f038eb2d7d5eb883b2967c8e38bedc3e +Subject: What's cooking in git.git (Mar 2011, #04; Wed, 23) +X-master-at: cd3065f9e3c27594a91540e971d147f1acba89de +X-next-at: 46300131fe1c0c8ebcb394416c551a5f8fa38342 -What's cooking in git.git (Mar 2011, #03; Tue, 22) +What's cooking in git.git (Mar 2011, #04; Wed, 23) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -13,7 +13,7 @@ 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, shaving my beauty sleep time. +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) @@ -21,112 +21,75 @@ close. Discussing new features may be more fun, but please, people, let's start wrapping things up for this cycle. -------------------------------------------------- -[Graduated to "master"] +[New Topics] -* jc/maint-fetch-alt (2011-03-11) 2 commits - (merged to 'next' on 2011-03-17 at c61ec4f) - + fetch-pack: objects in our alternates are available to us - + refs_from_alternate: helper to use refs from alternates - -* jc/maint-rev-list-culled-boundary (2011-03-14) 1 commit - (merged to 'next' on 2011-03-17 at 001b546) - + list-objects.c: don't add an unparsed NULL as a pending tree - -* jn/test-sanitize-git-env (2011-03-15) 5 commits - (merged to 'next' on 2011-03-17 at 80a3678) - + tests: scrub environment of GIT_* variables - + config: drop support for GIT_CONFIG_NOGLOBAL - + gitattributes: drop support for GIT_ATTR_NOGLOBAL - + tests: suppress system gitattributes - + tests: stop worrying about obsolete environment variables - -* js/maint-stash-index-copy (2011-03-16) 2 commits - (merged to 'next' on 2011-03-17 at 9f74cc8) - + stash: copy the index using --index-output instead of cp -p - + stash: fix incorrect quoting in cleanup of temporary files - -* mg/doc-bisect-tweak-worktree (2011-03-15) 2 commits - (merged to 'next' on 2011-03-17 at e0acf52) - + git-bisect.txt: example for bisecting with hot-fix - + git-bisect.txt: streamline run presentation - -* mg/rev-list-one-side-only (2011-03-10) 10 commits - (merged to 'next' on 2011-03-10 at 2a69869) - + git-log: put space after commit mark - + t6007: test rev-list --cherry - + log --cherry: a synonym - + rev-list: documentation and test for --cherry-mark - + revision.c: introduce --cherry-mark - + rev-list/log: factor out revision mark generation - + 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 - (this branch is used by mg/rev-list-n-parents.) - -* sg/complete-symmetric-diff (2011-03-10) 2 commits - (merged to 'next' on 2011-03-17 at adb0618) - + bash: complete 'git diff ...branc' - + bash: fix misindented esac statement in __git_complete_file() - -* sp/maint-fetch-pack-stop-early (2011-03-14) 2 commits - (merged to 'next' on 2011-03-17 at 2580068) - + fetch-pack: Implement no-done capability - + fetch-pack: Finish negotation if remote replies "ACK %s ready" - (this branch is used by jc/fetch-progressive-stride.) - -* sp/maint-upload-pack-stop-early (2011-03-14) 2 commits - (merged to 'next' on 2011-03-17 at e717a84) - + upload-pack: Implement no-done capability - + upload-pack: More aggressively send 'ACK %s ready' - -* tl/p4 (2011-03-15) 3 commits - (merged to 'next' on 2011-03-17 at 3d7f69f) - + git-p4: Fix error message crash in P4Sync.commit. - + Teach git-p4 to ignore case in perforce filenames if configured. - + git-p4: Teach gitConfig method about arguments. +* jc/diff-dotdot (2011-03-23) 2 commits + - warn use of "git diff A..B" + - diff: remove dead code that flips arguments order --------------------------------------------------- -[New Topics] +This is 1/4 tongue-in-cheek but mostly serious. -* 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 +* 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 -The earlier one was a flawed migration path. We would probably need -per-user preference after all. +The bottom two feel like a right thing to do, but "show" may not be a +right example. -* jk/checkout-orphan-warning (2011-03-20) 3 commits - - checkout: tweak detached-orphan warning format - - checkout: clear commit marks after detached-orphan check - - checkout: add basic tests for detached-orphan warning +-------------------------------------------------- +[Graduated to "master"] -Will merge to 'next'. +* 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 -* mg/rev-list-n-parents (2011-03-21) 3 commits - - 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 +* 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 -Perhaps will wait until the "infinity" syntax settles. +* 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/index-update-if-able (2011-03-21) 2 commits - - update $GIT_INDEX_FILE when there are racily clean entries - - diff/status: refactor opportunistic index update +* 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 -* jp/completion-help-alias (2011-03-21) 1 commit - - git-completion: Add git help completion for aliases +* 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 -* js/remove-unused-variables (2011-03-22) 1 commit - - Remove unused variables +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'. -* sb/sparse-more (2011-03-21) 1 commit - - Makefile: Cover more files with make check +* 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 + +* 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 -------------------------------------------------- [Stalled] +* 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 + +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. + * 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 @@ -222,13 +185,47 @@ current usage context. Do not merge; it would be preferable to use ":/" or whatever magic pathspec that is relative to the root of the working tree. +-------------------------------------------------- +[Cooking] + * jc/maint-rerere-in-workdir (2011-03-10) 1 commit - - rerere: make sure it works even in a workdir attached to a young repository + (merged to 'next' on 2011-03-23 at e5ef1a2) + + rerere: make sure it works even in a workdir attached to a young repository -Do not merge; needs more thought around relative symlinks. +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. --------------------------------------------------- -[Cooking] +* 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 + +* 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 + +* js/remove-unused-variables (2011-03-22) 1 commit + (merged to 'next' on 2011-03-23 at 4630013) + + Remove unused variables + +* sb/sparse-more (2011-03-21) 1 commit + (merged to 'next' on 2011-03-23 at 4bec1d1) + + Makefile: Cover more files with make check * jc/rename-degrade-cc-to-c (2011-01-06) 4 commits - diffcore-rename: fall back to -C when -C -C busts the rename limit @@ -242,23 +239,6 @@ rebasing on bf0ab10 (merge: improve inexact rename limit warning, warning outside merge-recursive codepath. The top one ended up larger than it should have been as a result. -* 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 - -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'. - -* 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 - -Will merge to 'master'. - * cn/system-path-tweak (2011-03-17) 1 commit - system_path: use a static buffer @@ -268,28 +248,6 @@ Will merge to 'master'. + fetch-pack: progressively use larger handshake windows + fetch-pack: factor out hardcoded handshake window size -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - * en/merge-recursive (2011-03-17) 4 commits (merged to 'next' on 2011-03-18 at a32016b) + merge-recursive: tweak magic band-aid @@ -322,88 +280,81 @@ I am not happy with these magic band aids. 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 (2010-09-06) 1 commit - - doc: technical details about the index file format - -Will merge to 'next'. +* 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 - - 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 - --------------------------------------------------- -[Discarded] - -* nd/rfc-add-u-full-tree (2011-02-07) 1 commit - - add: make "add -u" update full tree without pathspec - -See jc/add-u-migration. - - + (merged to 'next' on 2011-03-23 at e2732e2) + + 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 + +Now in 'next'. -- 2.47.3