From: Junio C Hamano Date: Wed, 6 Apr 2011 20:01:59 +0000 (-0700) Subject: What's cooking (2011/04 #02) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b460ad3e9461ec26a7bad65fe892b9b33ffea8f;p=thirdparty%2Fgit.git What's cooking (2011/04 #02) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index a2382e3e41..7699c22cab 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,188 +1,89 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Apr 2011, #01; Sun, 3) -X-master-at: 44bc573436c98b7c6cd798af04c538f6e76f0f6e -X-next-at: c63fac87daebf1437e8dc8c7ead5a4c7cadf15e0 +Subject: What's cooking in git.git (Apr 2011, #02; Wed, 6) +X-master-at: 6be0559183ac0b40680df314748141d1bdf28e41 +X-next-at: 00b8c7c14947fdc050aa2896ceffcc245873ec3e -What's cooking in git.git (Apr 2011, #01; Sun, 3) +What's cooking in git.git (Apr 2011, #02; Wed, 6) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' while commits prefixed with '+' are in 'next'. -Hopefully we will have 1.7.5-rc1 coming Wednesday. +The tip of 'master' is at 1.7.5-rc1 now. -------------------------------------------------- [New Topics] -* ar/clean-rmdir-empty (2011-04-01) 1 commit - (merged to 'next' on 2011-04-03 at c63fac8) - + clean: unreadable directory may still be rmdir-able if it is empty +* dm/http-cleanup (2011-03-30) 2 commits + - http-push: refactor curl_easy_setup madness + - http: make curl callbacks match contracts from curl header -This should be very safe and Ok to merge before -rc1; it is not urgent, -though. +* jc/pack-objects-bigfile (2011-04-05) 1 commit + - Teach core.bigfilethreashold to pack-objects -* jc/rev-list-options-fix (2011-04-01) 1 commit - (merged to 'next' on 2011-04-03 at 91f19de) - + "log --cherry-pick" documentation regression fix +* jk/maint-stash-oob (2011-04-06) 2 commits + - stash: fix false positive in the invalid ref test. + - stash: fix accidental apply of non-existent stashes -We should merge this before -rc1, but there might be other similar -breakages in the text flow due to the same f98fd43 (git-log.txt, -rev-list-options.txt: put option blocks in proper order, 2011-03-08). +* nk/blame-abbrev (2011-04-06) 1 commit + - blame: add --abbrev command line option and make it honor core.abbrev -* jk/maint-push-async-hang (2011-03-31) 4 commits - - send-pack: abort sideband demuxer on pack-objects error - - run-command: allow aborting async code prematurely - - finish_async: be quiet when waiting for async process - - teach wait_or_whine a "quiet" mode - (this branch is used by jk/maint-push-async-hang-threads.) - -* jk/maint-push-async-hang-threads (2011-03-31) 2 commits - - run-command: implement abort_async for pthreads - - Merge branch 'jk/maint-push-async-hang' into jk/maint-push-async-hang-threads - (this branch uses jk/maint-push-async-hang.) +* nm/submodule-update-force (2011-04-01) 1 commit + - submodule: Add --force option for git submodule update -* mg/doc-revisions-txt (2011-04-01) 3 commits - - revisions.txt: language improvements - - revisions.txt: structure with a labelled list - - revisions.txt: consistent use of quotes +* jk/maint-upload-pack-shallow (2011-04-04) 1 commit + - [REVISIT] upload-pack deadlock during a shallow clone -Most parts looked reasonable except for some nits. +* jk/stash-loosen-safety (2011-04-05) 1 commit + - stash: drop dirty worktree check on apply -* mg/reflog-with-options (2011-04-01) 3 commits - (merged to 'next' on 2011-04-03 at e69a95c) - + reflog: fix overriding of command line options - + t/t1411: test reflog with formats - + builtin/log.c: separate default and setup of cmd_log_init() - (this branch is used by mg/show-without-prune.) +-------------------------------------------------- +[Graduated to "master"] -Reasonable, but can wait. +* jc/rev-list-options-fix (2011-04-01) 1 commit + (merged to 'next' on 2011-04-03 at 91f19de) + + "log --cherry-pick" documentation regression fix -* mg/show-without-prune (2011-04-01) 1 commit - - builtin/show: do not prune by pathspec - (this branch uses mg/reflog-with-options.) +* jk/maint-remote-mirror-safer (2011-03-30) 3 commits + (merged to 'next' on 2011-04-03 at ccc9c1a) + + remote: deprecate --mirror + + remote: separate the concept of push and fetch mirrors + + remote: disallow some nonsensical option combinations -I wanted to like this, but it still feels like too much magic. +This avoids a nonsense configuration to be created to confuse unsuspecting +users. -* mh/git-svn-automkdirs (2011-04-01) 1 commit - (merged to 'next' on 2011-04-03 at 7fa4978) - + git-svn: add an option to skip the creation of empty directories +* jl/submodule-fetch-on-demand (2011-03-06) 7 commits + (merged to 'next' on 2011-03-20 at a5e452d) + + fetch/pull: Describe --recurse-submodule restrictions in the BUGS section + + 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 -Should be safe, but I'd like an Ack from git-svn folks. +* mg/doc-revisions-txt (2011-04-04) 3 commits + (merged to 'next' on 2011-04-04 at ebf3612) + + revisions.txt: language improvements + + revisions.txt: structure with a labelled list + + revisions.txt: consistent use of quotes * nm/maint-conflicted-submodule-entries (2011-03-30) 1 commit (merged to 'next' on 2011-04-03 at 40c5094) + submodule: process conflicting submodules only once -A fix to a rather common operation and the implementation looked -low-impact enough. Do submodule people want this in 1.7.5? - -* dm/color-palette (2011-03-30) 1 commit - - Share color list between graph and show-branch - -* mg/sha1-path-advise (2011-03-31) 2 commits - - sha1_name: Suggest commit:./file for path in subdir - - t1506: factor out test for "Did you mean..." - -------------------------------------------------- -[Graduated to "master"] +[Stalled] -* ab/i18n-st (2011-02-22) 69 commits - (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 - -* jc/merge-sans-branch (2011-03-23) 2 commits - (merged to 'next' on 2011-03-31 at 754a6af) - + merge: merge with the default upstream branch without argument - + merge: match the help text with the documentation - -* jk/pull-into-empty (2011-03-25) 2 commits - (merged to 'next' on 2011-03-31 at d4dd598) - + pull: do not clobber untracked files on initial pull - + merge: merge unborn index before setting ref - -* jr/grep-en-config (2011-03-30) 1 commit - (merged to 'next' on 2011-03-31 at 2a73028) - + grep: allow -E and -n to be turned on by default via configuration - -* nd/init-gitdir (2011-03-19) 2 commits - (merged to 'next' on 2011-03-31 at 3b8fb40) - + init, clone: support --separate-git-dir for .git file - + git-init.txt: move description section up - -* sb/sparse-more (2011-03-21) 1 commit - (merged to 'next' on 2011-03-23 at 4bec1d1) - + Makefile: Cover more files with make check +* jh/gitweb-localtime (2011-03-23) 1 commit + - gitweb: javascript ability to adjust time based on timezone --------------------------------------------------- -[Stalled] +* mg/show-without-prune (2011-04-01) 1 commit + - builtin/show: do not prune by pathspec + (this branch uses mg/reflog-with-options.) + +I wanted to like this, but it still feels like too much magic. * gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit - Look for password in both CVS and CVSNT password files. @@ -214,6 +115,46 @@ current usage context. -------------------------------------------------- [Cooking] +* dm/color-palette (2011-04-05) 1 commit + (merged to 'next' on 2011-04-04 at 0244ef9) + + Share color list between graph and show-branch + +* mg/sha1-path-advise (2011-03-31) 2 commits + (merged to 'next' on 2011-04-04 at e429e0c) + + sha1_name: Suggest commit:./file for path in subdir + + t1506: factor out test for "Did you mean..." + +* ar/clean-rmdir-empty (2011-04-01) 1 commit + (merged to 'next' on 2011-04-03 at c63fac8) + + clean: unreadable directory may still be rmdir-able if it is empty + +* jk/maint-push-async-hang (2011-03-31) 4 commits + - send-pack: abort sideband demuxer on pack-objects error + - run-command: allow aborting async code prematurely + - finish_async: be quiet when waiting for async process + - teach wait_or_whine a "quiet" mode + (this branch is used by jk/maint-push-async-hang-threads.) + +* jk/maint-push-async-hang-threads (2011-03-31) 2 commits + - run-command: implement abort_async for pthreads + - Merge branch 'jk/maint-push-async-hang' into jk/maint-push-async-hang-threads + (this branch uses jk/maint-push-async-hang.) + +* mg/reflog-with-options (2011-04-01) 3 commits + (merged to 'next' on 2011-04-03 at e69a95c) + + reflog: fix overriding of command line options + + t/t1411: test reflog with formats + + builtin/log.c: separate default and setup of cmd_log_init() + (this branch is used by mg/show-without-prune.) + +Reasonable, but can wait. + +* mh/git-svn-automkdirs (2011-04-01) 1 commit + (merged to 'next' on 2011-04-03 at 7fa4978) + + git-svn: add an option to skip the creation of empty directories + +Should be safe, but I'd like an Ack from git-svn folks. + * jc/diff-irreversible-delete (2011-02-28) 1 commit (merged to 'next' on 2011-04-03 at 5a23b23) + git diff -D: omit the preimage of deletes @@ -223,15 +164,6 @@ Unstuck, thanks to Michael J Gruber. * jh/notes-add-ui (2011-03-30) 1 commit - Make "git notes add" more user-friendly when there are existing notes -* jk/maint-remote-mirror-safer (2011-03-30) 3 commits - (merged to 'next' on 2011-04-03 at ccc9c1a) - + remote: deprecate --mirror - + remote: separate the concept of push and fetch mirrors - + remote: disallow some nonsensical option combinations - -May want to merge by 1.7.5 as this avoids a nonsense configuration to be -created to confuse unsuspecting users. - * jk/notes-ui-updates (2011-03-30) 7 commits - log/pretty-options: Document --[no-]notes and deprecate old notes options - revision.c: make --no-notes reset --notes list @@ -293,11 +225,8 @@ merge before 1.7.5. I wanted to wait for an independent Ack or two for the tip one, which was a response to regression concerns raised by J6t, but ended up merging it -after giving another look. Will not merge before 1.7.5, as there is no -user visible improvements up to this point. - -* jh/gitweb-localtime (2011-03-23) 1 commit - - gitweb: javascript ability to adjust time based on timezone +to 'next' after giving another look. Will not merge before 1.7.5, as +there is no user visible improvements up to this point. * jk/maint-merge-rename-create (2011-03-25) 3 commits (merged to 'next' on 2011-03-31 at b9bc9f1) @@ -305,15 +234,14 @@ user visible improvements up to this point. + merge: handle renames with replacement content + t3030: fix accidental success in symlink rename -May merge before rc1, but it is Ok to wait. - * mz/maint-rename-unmerged (2011-03-23) 1 commit (merged to 'next' on 2011-03-31 at c7b3d9a) + diffcore-rename: don't consider unmerged path as source Will cook until 1.7.5 final. -* nd/struct-pathspec (2011-03-25) 4 commits +* nd/struct-pathspec (2011-04-05) 5 commits + - pathspec: rename per-item field has_wildcard to use_wildcard (merged to 'next' on 2011-03-31 at 66cbb7d) + Improve tree_entry_interesting() handling code + Convert read_tree{,_recursive} to support struct pathspec @@ -328,12 +256,8 @@ Will cook until 1.7.5 final. (merged to 'next' on 2011-03-31 at 962e058) + add: make "add -u/-A" update full tree without pathspec -The bottom one is a necessary first step toward the UI clean-up planned -for 1.8.0 which we discussed in length in the earlier part of the cycle; -the change is low impact, isolated, and has no risk of breaking the system -as a whole, but I would wait until the ":/" magic pathspec materializes, -as the advice message would have to become different, and the way to get -more stable semantics will become more direct. +Need to redo the advice after the "this is from root of the working tree" +magic pathspec. * jc/rename-degrade-cc-to-c (2011-01-06) 4 commits (merged to 'next' on 2011-03-31 at 8d685d7) @@ -347,6 +271,8 @@ Will hold. * cn/system-path-tweak (2011-03-17) 1 commit - system_path: use a static buffer +Don't see much point in this itself. Probably will drop. + * en/merge-recursive (2011-03-17) 4 commits (merged to 'next' on 2011-03-18 at a32016b) + merge-recursive: tweak magic band-aid @@ -356,35 +282,3 @@ Will hold. + t6022: New test checking for unnecessary updates of renamed+modified files I am not happy with these magic band aids. Will hold. - -* jl/submodule-fetch-on-demand (2011-03-06) 7 commits - (merged to 'next' on 2011-03-20 at a5e452d) - + fetch/pull: Describe --recurse-submodule restrictions in the BUGS section - + 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 - -Will merge. - --------------------------------------------------- -[Discarded] - -* jk/edit-notes-in-commit-log (2011-03-07) 2 commits - . [wip] commit: allow editing notes in commit message editor - . notes: make expand_notes_ref globally accessible - -* 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 - -* mg/grep-full-tree (2011-03-01) 2 commits - . grep: make --full-tree work with pathspecs - . grep: --full-tree - -It would be preferable to use ":/" or whatever magic pathspec that is -relative to the root of the working tree.