From: Junio C Hamano Date: Fri, 24 May 2013 21:10:05 +0000 (-0700) Subject: What's cooking (2013/05 #07) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e1f1d5c8a7e76bbe9bd869a8098e67086627d62;p=thirdparty%2Fgit.git What's cooking (2013/05 #07) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index ff27354299..d344b14e41 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,25 +1,27 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (May 2013, #06; Tue, 21) -X-master-at: 5e49f30c85ecacec98631462fa73f1148a01637c -X-next-at: 6bd1cbc7f99e9924e7312d52e6ec62d01f81905f +Subject: What's cooking in git.git (May 2013, #07; Fri, 24) +X-master-at: edca4152560522a431a51fc0a06147fc680b5b18 +X-next-at: ea353ceddcd1414717ea6ae8fce60c7b4d705849 -What's cooking in git.git (May 2013, #06; Tue, 21) +What's cooking in git.git (May 2013, #07; Fri, 24) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. -The final version of 1.8.3 is expected to be tagged late this week. +There are topics that are still in 'next', not because they needed +more testing, but only because we already were in the -rc period. +Now that 1.8.3 is out, we will start merging them to 'master' (and +some to 'maint' for 1.8.3.1) in the middle of the next week, after +waiting for a few days to make sure we can have a clean start of the +post 1.8.3 maint branch (with brown paper bag fixes and nothing +else). -I have kept many late topics outside 'next' during the -rc period -primarily because the original plan was to keep the -rc period short -for this cycle, and because rebuilding 'next' after the release will -make it a lot more cumbersome to maintain the "What's cooking" -report if we have many topics on 'next' already. But we ended up -having to do an extra -rc3 so I merged a bunch of topics including -the late ones to 'next' with this pushout. +The post 1.8.3 cycle will start early next month, at which time the +'next' branch will be rewound and rebuilt. Until then, I expect +that my patch queue may stay leaky while I take a bit of break. You can find the changes described here in the integration branches of the repositories listed at @@ -29,30 +31,67 @@ of the repositories listed at -------------------------------------------------- [New Topics] -* dm/unbash-subtree (2013-05-21) 1 commit - - contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash +* mh/reflife (2013-05-22) 17 commits + - refs: document the lifetime of the refname passed to each_ref_fn + - object_array_entry: copy name before storing in name field + - find_first_merges(): remove unnecessary code + - find_first_merges(): initialize merges variable using initializer + - fsck: don't put a void*-shaped peg in a char*-shaped hole + - object_array_remove_duplicates(): rewrite to reduce copying + - object_array: add function object_array_filter() + - get_revision_internal(): make check less mysterious + - gc_boundary(): move the check "alloc <= nr" to caller + - revision: split some overly-long lines + - cmd_diff(): make it obvious which cases are exclusive of each other + - cmd_diff(): rename local variable "list" -> "entry" + - cmd_diff(): use an object_array for holding trees + - builtin_diff_tree(): make it obvious that function wants two entries + - add_rev_cmdline(): make a copy of the name argument + - fetch: make own copies of refnames + - describe: make own copy of refname + Define memory ownership and lifetime rules for what for-each-ref + feeds to its callbacks (in short, "you do not own it, so make a + copy if you want to keep it"). -* fc/transport-helper-no-refspec (2013-05-21) 2 commits - - transport-helper: check if the dry-run is supported - - transport-helper: barf when user tries old:new + Some parts are still RFC. -* rr/die-on-missing-upstream (2013-05-21) 2 commits - - sha1_name: fix error message for @{}, @{} - - sha1_name: fix error message for @{u} +* th/bisect-skip-report-range-fix (2013-05-22) 1 commit + - bisect: Fix log output for multi-parent skip ranges - When a reflog notation is used for implicit "current branch", we - did not say which branch and worse said "branch ''". + Fix for an additional bisect log comments. + Will merge to 'next'. + + +* mm/mediawiki-https-fail-message (2013-05-23) 1 commit + - git-remote-mediawiki: better error message when HTTP(S) access fails + + Hint users when https:// connection failed to check the + certificate; it is a good hint if we assumie that it is common + error for the end users to make. + + Will merge to 'next'. + + +* tg/maint-zsh-svn-remote-prompt (2013-05-22) 1 commit + - prompt: fix show upstream with svn and zsh + + zsh prompt script that borrowed from bash prompt script did not + work due to slight differences in array variable notation between + these two shells. + + Will merge to 'next'. + + +* tr/push-no-verify-doc (2013-05-23) 1 commit + - Document push --no-verify + + "git push --[no-]verify" was not documented. + + Will merge to 'next'. -* jc/show-branch (2013-05-21) 5 commits - - show-branch: use commit slab to represent bitflags of arbitrary width - - show-branch.c: remove "all_mask" - - show-branch.c: abstract out "flags" operation - - show-branch.c: lift all_mask/all_revs to a global static - - show-branch.c: update comment style - (this branch uses jk/commit-info-slab.) -------------------------------------------------- [Stalled] @@ -116,6 +155,49 @@ of the repositories listed at -------------------------------------------------- [Cooking] +* dm/unbash-subtree (2013-05-21) 1 commit + - contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash + + It turns out that git-subtree script does not have to be run with + bash. + + Will merge to 'next'. + + +* fc/transport-helper-no-refspec (2013-05-21) 2 commits + - transport-helper: check if the dry-run is supported + - transport-helper: barf when user tries old:new + + With "export" remote-helper protocol, (1) a push that tries to + update a remote ref whose name is different from the pushing side + does not work yet, and (2) the helper may not know how to do + --dry-run, so detect such problematic cases and disable them for + now. + + Will merge to 'next'. + + +* rr/die-on-missing-upstream (2013-05-22) 2 commits + - sha1_name: fix error message for @{}, @{} + - sha1_name: fix error message for @{u} + + When a reflog notation is used for implicit "current branch", we + did not say which branch and worse said "branch ''". + + Waiting for series of rerolls to settle. + + +* jc/show-branch (2013-05-21) 5 commits + - show-branch: use commit slab to represent bitflags of arbitrary width + - show-branch.c: remove "all_mask" + - show-branch.c: abstract out "flags" operation + - show-branch.c: lift all_mask/all_revs to a global static + - show-branch.c: update comment style + (this branch uses jk/commit-info-slab.) + + Waiting for the final step to lift the hard-limit before sending it out. + + * fc/remote-bzr (2013-05-16) 6 commits - remote-bzr: trivial cleanups - remote-bzr: change global repo @@ -127,8 +209,10 @@ of the repositories listed at The ones near the tip conflicted with the hotfix for 1.8.3 so I discarded them for now. + Expecting a reroll on top of 1.8.3 + -* jx/clean-interactive (2013-05-20) 15 commits +* jx/clean-interactive (2013-05-22) 15 commits - test: add t7301 for git-clean--interactive - git-clean: add documentation for interactive git-clean - git-clean: add ask each interactive action @@ -145,6 +229,8 @@ of the repositories listed at - path.c: refactor relative_path(), not only strip prefix - test: add test cases for relative_path + Still under discussion, e.g. $gmane/225139. + * tr/test-v-and-v-subtest-only (2013-05-16) 6 commits - test-lib: support running tests under valgrind in parallel @@ -164,26 +250,36 @@ of the repositories listed at (merged to 'next' on 2013-05-21 at f76baf3) + Documentation/merge-options.txt: restore `-e` option + Will merge to 'master'. + * rr/zsh-color-prompt (2013-05-17) 3 commits - prompt: colorize ZSH prompt - prompt: factor out gitstring coloring logic - prompt: introduce GIT_PS1_STATESEPARATOR + Will merge to 'next'. + * an/diff-index-doc (2013-05-20) 1 commit (merged to 'next' on 2013-05-21 at 6e1459b) + Documentation/diff-index: mention two modes of operation + Will merge to 'master'. + * fc/contrib-related (2013-05-20) 1 commit - Add new git-related helper to contrib + Waiting the design review for this earliest part to settle. + * mc/describe-first-parent (2013-05-20) 1 commit (merged to 'next' on 2013-05-21 at 2e02ffc) + describe: Add --first-parent option + Will merge to 'master'. + * rs/tar-tests (2013-05-20) 6 commits (merged to 'next' on 2013-05-21 at aed12a7) @@ -194,6 +290,8 @@ of the repositories listed at + t5000, t5003: create directories for extracted files lazily + t5000: integrate export-subst tests into regular tests + Will merge to 'master'. + * da/darwin (2013-05-21) 4 commits (merged to 'next' on 2013-05-21 at 0497edb) @@ -205,6 +303,8 @@ of the repositories listed at Newer MacOS X encourages the programs to compile and link with their CommonCrypto, not with OpenSSL. + Will merge to 'master'. + * fc/macos-x-clipped-write (2013-05-17) 1 commit (merged to 'next' on 2013-05-21 at 510b0dd) @@ -213,6 +313,8 @@ of the repositories listed at Mac OS X does not like to write(2) more than INT_MAX number of bytes. + Will merge to 'master'. + * fc/remote-hg (2013-05-21) 41 commits - remote-hg: remove files before modifications @@ -260,6 +362,9 @@ of the repositories listed at The remainder are to be rerolled on top of the bottom-two, so I flipped the order of the series. + Will merge the bottom two to 'next'. + Leaving the remainder up to Felipe to reroll or advance to 'next'. + * hv/config-from-blob (2013-05-12) 5 commits - do not die when error in config parsing of buf occurs @@ -268,6 +373,9 @@ of the repositories listed at - config: drop cf validity check in get_next_char() - config: factor out config file stack management + Will see a resubmit. + $gmane/223964 + * jc/t5551-posix-sed-bre (2013-05-12) 1 commit (merged to 'next' on 2013-05-21 at d597ca1) @@ -275,6 +383,8 @@ of the repositories listed at POSIX fix for a test script. + Will merge to 'master'. + * jk/fetch-always-update-tracking (2013-05-12) 4 commits (merged to 'next' on 2013-05-21 at f7e4b16) @@ -291,6 +401,8 @@ of the repositories listed at chance, and we have been updating them when we run "git push" which already breaks the original "predictability" anyway. + Will merge to 'master'. + * nd/clone-connectivity-shortcut (2013-05-11) 4 commits - clone: open a shortcut for connectivity check @@ -298,6 +410,9 @@ of the repositories listed at - fetch-pack: prepare updated shallow file before fetching the pack - clone: let the user know when check_everything_connected is run + Needs some minor fixups. + $gmane/223584 + * rr/rebase-autostash (2013-05-12) 7 commits - rebase: implement --[no-]autostash and rebase.autostash @@ -308,6 +423,11 @@ of the repositories listed at - rebase -i: don't error out if $state_dir already exists - am: tighten a conditional that checks for $dotest + This is from v3 with some "Fixed" message in $gmane/224111 without + a reroll yet. Also there was an attempt to follow-up, but it was + never completed. + $gmane/224125 + * kb/ancestry-path-threedots (2013-05-16) 2 commits (merged to 'next' on 2013-05-21 at 5d75bd3) @@ -319,6 +439,8 @@ of the repositories listed at not pay attention to the fact that the merge base between A and B was the bottom of the range being specified. + Will merge to 'master'. + * kb/full-history-compute-treesame-carefully-2 (2013-05-16) 15 commits - revision.c: make default history consider bottom commits @@ -343,6 +465,8 @@ of the repositories listed at Will not be a 1.8.3 material, but is an important topic. + Will merge to 'next'. + * jc/strbuf-branchname-fix (2013-05-16) 1 commit (merged to 'next' on 2013-05-21 at 5db8872) @@ -352,6 +476,8 @@ of the repositories listed at incorrectly when your previous branch was "frotz" (it should be rewritten to "git merge frotz~22" instead). + Will merge to 'master'. + * mk/combine-diff-context-horizon-fix (2013-05-15) 1 commit (merged to 'next' on 2013-05-21 at f462c02) @@ -360,6 +486,8 @@ of the repositories listed at "git diff -c -p" was not showing a deleted line from a hunk when another hunk immediately begins where the earlier one ends. + Will merge to 'master'. + * mm/color-auto-default (2013-05-15) 2 commits - make color.ui default to 'auto' @@ -371,6 +499,8 @@ of the repositories listed at expedite it, as this change is not all that important to deserve a major version bump. + I'd vote for merging this without waiting for 2.0. + * tr/coverage (2013-05-13) 4 commits (merged to 'next' on 2013-05-21 at 8480007) @@ -382,6 +512,8 @@ of the repositories listed at Update the test coverage support that was left to bitrot for some time. + Will merge to 'master'. + * mg/more-textconv (2013-05-10) 7 commits (merged to 'next' on 2013-05-21 at 701cdb7) @@ -396,6 +528,9 @@ of the repositories listed at Make "git grep" and "git show" pay attention to --textconv when dealing with blob objects. + I thought this was pretty well designed and executed, but it seems + there are some doubts on the list. + * jh/shorten-refname (2013-05-07) 4 commits - t1514: refname shortening is done after dereferencing symbolic refs @@ -409,6 +544,8 @@ of the repositories listed at ref that points at remotes/origin/something, then it should show "origin/something" and it already does). + Expecting a reroll, as an early part of a larger series. + * nd/clone-local-with-colon (2013-05-07) 1 commit (merged to 'next' on 2013-05-21 at 3e293bd) @@ -418,6 +555,8 @@ of the repositories listed at over git-over-ssh specified in the scp style. Detect this case and clone from a local repository at "foo/bar:baz". + Will merge to 'master'. + * nd/warn-ambiguous-object-name (2013-05-07) 1 commit - get_sha1: improve ambiguity warning regarding SHA-1 and ref names @@ -438,6 +577,8 @@ of the repositories listed at + completion: synchronize zsh wrapper + completion: cleanup zsh wrapper + Will merge to 'master'. + * rs/empty-archive (2013-05-09) 2 commits (merged to 'next' on 2013-05-21 at 3e9e288) @@ -446,6 +587,8 @@ of the repositories listed at Fixes tests added in 1.8.2 era that are broken on BSDs. + Will merge to 'master'. + * vv/help-unknown-ref (2013-05-08) 2 commits (merged to 'next' on 2013-05-21 at 77a2941) @@ -456,6 +599,8 @@ of the repositories listed at and give an error message that is more specific than "foo is not something we can merge". + Will merge to 'master'. + * fc/fast-export-persistent-marks (2013-05-07) 3 commits (merged to 'next' on 2013-05-21 at 10b8214) @@ -467,6 +612,8 @@ of the repositories listed at arbitrary object name and parsing object when only presence and type information is necessary, etc. + Will merge to 'master'. + * jc/core-checkstat-2.0 (2013-05-06) 2 commits - core.statinfo: remove as promised in Git 2.0 @@ -474,6 +621,8 @@ of the repositories listed at The bottom one is a fix for a breakage of a new feature in 1.8.2. + Will merge to 'next' (the bottom one only). + * jk/packed-refs-race (2013-05-06) 4 commits - for_each_ref: load all loose refs before packed refs @@ -481,6 +630,8 @@ of the repositories listed at - add a stat_validity struct - resolve_ref: close race condition for packed refs + What is the status of this thing? + * fc/at-head (2013-05-08) 13 commits - sha1_name: compare variable with constant, not constant with variable @@ -500,6 +651,8 @@ of the repositories listed at Instead of typing four capital letters "HEAD", you can say "@" instead. + Will merge to 'next'. + * jk/lookup-object-prefer-latest (2013-05-02) 1 commit (merged to 'next' on 2013-05-06 at cc59dcc) @@ -508,6 +661,8 @@ of the repositories listed at Optimizes object lookup when the object hashtable starts to become crowded. + Will merge to 'master'. + * jk/subtree-do-not-push-if-split-fails (2013-05-01) 1 commit (merged to 'next' on 2013-05-06 at 81bdf37) @@ -516,6 +671,8 @@ of the repositories listed at "git subtree" (in contrib/) had one codepath with loose error checks to lose data at the remote side. + Will merge to 'master'. + * fc/completion (2013-04-27) 9 commits (merged to 'next' on 2013-05-21 at aba6ef1) @@ -529,8 +686,7 @@ of the repositories listed at + completion: document tilde expansion failure in tests + completion: add file completion tests - I think this is ready for 'next'; not that it matters during the - prerelease feature freeze. + Will merge to 'master'. * jk/test-output (2013-05-06) 3 commits @@ -544,7 +700,7 @@ of the repositories listed at inconsistently between the test framework and t/Makefile, and logic to summarize the results looked at a wrong place. - Will cook in 'next'. + Will merge to 'master'. * rj/sparse (2013-04-28) 10 commits @@ -560,30 +716,7 @@ of the repositories listed at + compat/fnmatch/fnmatch.c: Fix a sparse error + compat/regex/regexec.c: Fix some sparse warnings - Will cook in 'next'. - - -* js/transport-helper-error-reporting-fix (2013-04-28) 13 commits - (merged to 'next' on 2013-04-29 at 8cc4bb8) - + git-remote-testgit: build it to run under $SHELL_PATH - + git-remote-testgit: further remove some bashisms - + git-remote-testgit: avoid process substitution - (merged to 'next' on 2013-04-25 at 3358f1a) - + t5801: "VAR=VAL shell_func args" is forbidden - (merged to 'next' on 2013-04-22 at 5ba6467) - + transport-helper: update remote helper namespace - + transport-helper: trivial code shuffle - + transport-helper: warn when refspec is not used - + transport-helper: clarify pushing without refspecs - + transport-helper: update refspec documentation - + transport-helper: clarify *:* refspec - + transport-helper: improve push messages - + transport-helper: mention helper name when it dies - + transport-helper: report errors properly - (this branch is tangled with fc/transport-helper-error-reporting.) - - Finishing touches to fc/transport-helper-error-reporting topic. - Will cook in 'next'. + Will merge to 'master'. * mh/fetch-into-shallow (2013-05-02) 2 commits @@ -592,7 +725,7 @@ of the repositories listed at (merged to 'next' on 2013-04-29 at a167d3e) + upload-pack: ignore 'shallow' lines with unknown obj-ids - Will cook in 'next'. + Will merge to 'master'. * jh/checkout-auto-tracking (2013-04-21) 8 commits @@ -612,7 +745,7 @@ of the repositories listed at remote "origin" may be what uniquely map its own branch to remotes/some/where/foo but that some/where may not be "origin". - Will cook in 'next'. + Will merge to 'master'. * jc/prune-all (2013-04-25) 4 commits @@ -630,7 +763,7 @@ of the repositories listed at Update "git gc" and "git reflog" with a new parsing function for expiry dates. - Will cook in 'next'. + Will merge to 'master'. * as/check-ignore (2013-04-29) 6 commits @@ -646,7 +779,7 @@ of the repositories listed at Enhance "check-ignore" (1.8.2 update) to work more like "check-attr" over bidi-pipes. - Will cook in 'next'. + Will merge to 'master'. * mh/packed-refs-various (2013-05-01) 33 commits @@ -689,7 +822,7 @@ of the repositories listed at Updates reading and updating packed-refs file, correcting corner case bugs. - Will cook in 'next'. + Will merge to 'master'. * fc/transport-helper-error-reporting (2013-05-10) 12 commits @@ -713,7 +846,31 @@ of the repositories listed at Update transport helper to report errors and maintain ref hierarchy used to keep track of remote helper state better. - Will cook in 'next'. + Will merge to 'master'. + + +* js/transport-helper-error-reporting-fix (2013-04-28) 13 commits + (merged to 'next' on 2013-04-29 at 8cc4bb8) + + git-remote-testgit: build it to run under $SHELL_PATH + + git-remote-testgit: further remove some bashisms + + git-remote-testgit: avoid process substitution + (merged to 'next' on 2013-04-25 at 3358f1a) + + t5801: "VAR=VAL shell_func args" is forbidden + (merged to 'next' on 2013-04-22 at 5ba6467) + + transport-helper: update remote helper namespace + + transport-helper: trivial code shuffle + + transport-helper: warn when refspec is not used + + transport-helper: clarify pushing without refspecs + + transport-helper: update refspec documentation + + transport-helper: clarify *:* refspec + + transport-helper: improve push messages + + transport-helper: mention helper name when it dies + + transport-helper: report errors properly + (this branch is tangled with fc/transport-helper-error-reporting.) + + Finishing touches to fc/transport-helper-error-reporting topic. + + Will merge to 'master'. * jk/submodule-subdirectory-ok (2013-04-24) 3 commits @@ -726,7 +883,7 @@ of the repositories listed at Allow various subcommands of "git submodule" to be run not from the top of the working tree of the superproject. - Will cook in 'next'. + What's the status of this one? * jl/submodule-mv (2013-04-23) 5 commits @@ -742,7 +899,7 @@ of the repositories listed at inclusing relocating its working tree and adjusting the paths in the .gitmodules file. - Will cook in 'next'. + What's the status of this one? * jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit @@ -804,8 +961,6 @@ of the repositories listed at as/check-ignore and tr/line-log; I've already asked Duy to hold this and later rebase on top of them. - Will defer. - * tr/line-log (2013-04-22) 13 commits (merged to 'next' on 2013-04-22 at 8f2c1de) @@ -827,7 +982,7 @@ of the repositories listed at + Export rewrite_parents() for 'log -L' + Refactor parse_loc - Will cook in 'next'. + Will merge to 'master'. * jc/push-2.0-default-to-simple (2013-04-03) 1 commit