From: Junio C Hamano Date: Wed, 9 Sep 2015 20:54:06 +0000 (-0700) Subject: What's cooking (2015/09 #02) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f2cb463799419cfd733ce798a04fcd2479f5a45;p=thirdparty%2Fgit.git What's cooking (2015/09 #02) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 0b0810b3cf..b60afa2e13 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,20 +1,20 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Sep 2015, #01; Wed, 2) -X-master-at: 16ffa6443e279a9b3b63d7a2bebeb07833506010 -X-next-at: f624c3dbe0116484e9e326add66d7bb19da420e0 +Subject: What's cooking in git.git (Sep 2015, #02; Wed, 9) +X-master-at: 7a2c4af7a82eebf2ed0e60a2b36c31e70c619264 +X-next-at: 8a6dc4c4eedd63a3d9286c8083e0c7f522faa35b -What's cooking in git.git (Sep 2015, #01; Wed, 2) +What's cooking in git.git (Sep 2015, #02; Wed, 9) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. -An early preview 2.6-rc0 has been tagged. There are a few fixes -that should be merged down to 'master' that are still cooking in -'next', but other than that this should give a fairly good taste -for the upcoming release. +The first release candidate 2.6-rc1 has been tagged. Let's make +sure we catch any possible regressions from now on, without getting +distracted by yet more shiny new features. On the 'maint' front, +we'll have 2.5.2 tomorrow. You can find the changes described here in the integration branches of the repositories listed at @@ -24,146 +24,137 @@ of the repositories listed at -------------------------------------------------- [Graduated to "master"] -* ah/pack-objects-usage-strings (2015-08-28) 1 commit - (merged to 'next' on 2015-08-31 at 78c8240) - + pack-objects: place angle brackets around placeholders in usage strings +* jc/builtin-am-signoff-regression-fix (2015-09-06) 1 commit + (merged to 'next' on 2015-09-06 at 7e84b6f) + + am: match --signoff to the original scripted version - Usage string fix. + Recent "git am" had regression when adding a Signed-off-by line + with its "-s" option by an unintended tightening of how an existing + trailer block is detected. -* ah/read-tree-usage-string (2015-08-28) 1 commit - (merged to 'next' on 2015-08-31 at fbaa7bd) - + read-tree: replace bracket set with parentheses to clarify usage - - Usage string fix. - - -* ah/reflog-typofix-in-error (2015-08-28) 1 commit - (merged to 'next' on 2015-08-31 at 1b37218) - + reflog: add missing single quote to error message - - Error string fix. - - -* ah/submodule-typofix-in-error (2015-08-28) 1 commit - (merged to 'next' on 2015-08-31 at 5a20628) - + git-submodule: remove extraneous space from error message - - Error string fix. - - -* br/svn-doc-include-paths-config (2015-08-26) 1 commit - (merged to 'next' on 2015-08-31 at 27a305f) - + git-svn doc: mention "svn-remote..include-paths" +* jk/am-rerere-lock-fix (2015-09-01) 1 commit + (merged to 'next' on 2015-09-02 at 686c5c0) + + rerere: release lockfile in non-writing functions + Recent "git am" introduced a double-locking failure when used with + the "--3way" option that invokes rerere machinery. -* cc/trailers-corner-case-fix (2015-08-31) 1 commit - (merged to 'next' on 2015-09-01 at 4786608) - + trailer: support multiline title +-------------------------------------------------- +[New Topics] - The "interpret-trailers" helper mistook a multi-paragraph title of - a commit log message with a colon in it as the end of the trailer - block. +* jk/connect-clear-env (2015-09-08) 2 commits + (merged to 'next' on 2015-09-08 at 86b64f7) + + git_connect: clarify conn->use_shell flag + (merged to 'next' on 2015-09-06 at 9ddbed8) + + git_connect: clear GIT_* environment for ssh + The ssh transport, just like any other transport over the network, + did not clear GIT_* environment variables, but it is possible to + use SendEnv and AcceptEnv to leak them to the remote invocation of + Git, which is not a good idea at all. Explicitly clear them just + like we do for the local transport. -* dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update (2015-08-31) 1 commit - (merged to 'next' on 2015-08-31 at c4133fb) - + commit: don't rewrite shared index unnecessarily + Will merge to 'master'. - When re-priming the cache-tree opportunistically while committing - the in-core index as-is, we mistakenly invalidated the in-core - index too aggressively, causing the experimental split-index code - to unnecessarily rewrite the on-disk index file(s). +* jk/pack-protocol-doc (2015-09-03) 1 commit + (merged to 'next' on 2015-09-08 at 98d861d) + + pack-protocol: clarify LF-handling in PKT-LINE() -* ee/clean-test-fixes (2015-08-31) 1 commit - (merged to 'next' on 2015-09-01 at 0032b34) - + t7300: fix broken && chains + Streamline documentation of the pkt-line protocol. + Will merge to 'master'. -* jk/log-missing-default-HEAD (2015-08-31) 1 commit - (merged to 'next' on 2015-09-01 at 3f4582b) - + log: diagnose empty HEAD more clearly - "git init empty && git -C empty log" said "bad default revision 'HEAD'", - which was found to be a bit confusing to new users. +* ti/glibc-stdio-mutex-from-signal-handler (2015-09-04) 1 commit + (merged to 'next' on 2015-09-08 at c8047ba) + + pager: don't use unsafe functions in signal handlers + Allocation related functions and stdio are unsafe things to call + inside a signal handler, and indeed killing the pager can cause + glibc to deadlock waiting on allocation mutex as our signal handler + tries to free() some data structures in wait_for_pager(). Reduce + these unsafe calls. -* ls/p4-fold-case-client-specs (2015-08-28) 1 commit - (merged to 'next' on 2015-08-31 at f25a3bd) - + git-p4: honor core.ignorecase when using P4 client specs + I seem to recall Peff had other ideas? Let's revisit this in the + next cycle. - On case insensitive systems, "git p4" did not work well with client - specs. +* as/subtree-with-spaces (2015-09-08) 2 commits + (merged to 'next' on 2015-09-09 at f3d763d) + + contrib/subtree: respect spaces in a repository path + + t7900-subtree: test the "space in a subdirectory name" case -* nd/fixup-linked-gitdir (2015-08-25) 1 commit - (merged to 'next' on 2015-08-26 at 7b8a1aa) - + setup: update the right file in multiple checkouts + Update "git subtree" (in contrib/) so that it can take whitespaces + in the pathnames, not only in the in-tree pathname but the name of + the directory that the repository is in. - The code in "multiple-worktree" support that attempted to recover - from an inconsistent state updated an incorrect file. + Will merge to 'master'. -* rs/archive-zip-many (2015-08-28) 3 commits - (merged to 'next' on 2015-08-31 at b799358) - + archive-zip: support more than 65535 entries - + archive-zip: use a local variable to store the creator version - + t5004: test ZIP archives with many entries +* gb/apply-comment-typofix (2015-09-09) 1 commit + (merged to 'next' on 2015-09-09 at 29fb0ff) + + apply: comment grammar fix - "git archive" did not use zip64 extension when creating an archive - with more than 64k entries, which nobody should need, right ;-)? + Will merge to 'master'. -* rt/remove-hold-lockfile-for-append (2015-08-28) 1 commit - (merged to 'next' on 2015-08-31 at caabe4b) - + lockfile: remove function "hold_lock_file_for_append" +* gb/filter-branch-progress (2015-09-08) 1 commit + - filter-branch: add passed/remaining seconds on progress + Give progress meter to "git filter-branch". -* sb/read-cache-one-indent-style-fix (2015-08-31) 1 commit - (merged to 'next' on 2015-09-01 at adf8298) - + read-cache: fix indentation in read_index_from + Is a reroll coming? --------------------------------------------------- -[New Topics] -* jh/quiltimport-explicit-series-file (2015-09-01) 1 commit - (merged to 'next' on 2015-09-02 at 1129ca4) - + git-quiltimport: add commandline option --series +* jk/interpret-trailers-outside-a-repository (2015-09-08) 1 commit + (merged to 'next' on 2015-09-09 at a75fce3) + + interpret-trailers: allow running outside a repository - "quiltimport" allows to specify the series file by honoring the - $QUILT_SERIES environment and also --series command line option. + Allow "git interpret-trailers" to run outside of a Git repository. Will merge to 'master'. -* jk/am-rerere-lock-fix (2015-09-01) 1 commit - (merged to 'next' on 2015-09-02 at 686c5c0) - + rerere: release lockfile in non-writing functions +* jk/test-lint-forbid-when-finished-in-subshell (2015-09-08) 5 commits + (merged to 'next' on 2015-09-09 at 74ede61) + + test-lib-functions: detect test_when_finished in subshell + + t7800: don't use test_config in a subshell + + test-lib-functions: support "test_config -C ..." + + t5801: don't use test_when_finished in a subshell + + t7610: don't use test_config in a subshell - Recent "git am" introduced a double-locking failure when used with - the "--3way" option that invokes rerere machinery. - - Will merge to 'master' before 2.6-rc1. + Because "test_when_finished" in our test framework queues the + clean-up tasks to be done in a shell variable, it should not be + used inside a subshell. Add a mechanism to allow 'bash' to catch + such uses, and fix the ones that were found. + Will merge to 'master'. -* jk/async-pkt-line (2015-09-01) 2 commits - (merged to 'next' on 2015-09-02 at e185717) - + pkt-line: show packets in async processes as "sideband" - + run-command: provide in_async query function - The debugging infrastructure for pkt-line based communication has - been improved to mark the side-band communicatio specifically. +* ls/p4-lfs (2015-09-09) 5 commits + - git-p4: add Git LFS backend for large file system + - git-p4: add support for large file systems + - git-p4: return an empty list if a list config has no values + - git-p4: add gitConfigInt reader + - git-p4: add optional type specifier to gitConfig reader - Will merge to 'master'. + Teach "git p4" to send large blobs outside the repository by + talking to Git LFS. -* mp/t7060-diff-index-test (2015-09-02) 1 commit - - t7060: actually test "git diff-index --cached -M" +* nd/clone-linked-checkout (2015-09-07) 5 commits + - clone: better error when --reference is a linked checkout + - clone: allow --local from a linked checkout + - enter_repo: allow .git files in strict mode + - enter_repo: avoid duplicating logic, use is_git_directory() instead + - path.c: delete an extra space - Fix an old test that was doing the same thing as another one. + It was not possible to use a repository-lookalike created by "git + worktree add" as a local source of "git clone". - Will merge to 'next'. + Is a reroll coming? -------------------------------------------------- [Stalled] @@ -402,8 +393,39 @@ of the repositories listed at -------------------------------------------------- [Cooking] +* jh/quiltimport-explicit-series-file (2015-09-01) 1 commit + (merged to 'next' on 2015-09-02 at 1129ca4) + + git-quiltimport: add commandline option --series + + "quiltimport" allows to specify the series file by honoring the + $QUILT_SERIES environment and also --series command line option. + + Will merge to 'master'. + + +* jk/async-pkt-line (2015-09-01) 2 commits + (merged to 'next' on 2015-09-02 at e185717) + + pkt-line: show packets in async processes as "sideband" + + run-command: provide in_async query function + + The debugging infrastructure for pkt-line based communication has + been improved to mark the side-band communicatio specifically. + + Will merge to 'master'. + + +* mp/t7060-diff-index-test (2015-09-02) 1 commit + (merged to 'next' on 2015-09-08 at 80ff284) + + t7060: actually test "git diff-index --cached -M" + + Fix an old test that was doing the same thing as another one. + + Will merge to 'master'. + + * ah/show-ref-usage-string (2015-08-31) 1 commit - - show-ref: place angle brackets around variables in usage string + (merged to 'next' on 2015-09-08 at dc512c8) + + show-ref: place angle brackets around variables in usage string Both "git show-ref -h" and "git show-ref --help" illustrated that the "--exclude-existing" option makes the command read list of refs @@ -411,36 +433,52 @@ of the repositories listed at have a pair of "<>" around the placeholder that designate an input file, i.e. "git show-ref --exclude-existing < ". + Will merge to 'master'. -* jk/date-local (2015-09-01) 6 commits - - t6300: add tests for "-local" date formats - - t6300: add test for "raw" date format - - t6300: make UTC and local dates different - - t6300: introduce test_date() helper - - date: make "local" orthogonal to date format - - fast-import: switch crash-report date to iso8601 + +* jk/date-local (2015-09-03) 11 commits + (merged to 'next' on 2015-09-08 at 66781d9) + + t6300: add tests for "-local" date formats + + t6300: make UTC and local dates different + + date: make "local" orthogonal to date format + + date: check for "local" before anything else + + t6300: add test for "raw" date format + + t6300: introduce test_date() helper + + fast-import: switch crash-report date to iso8601 + + Documentation/rev-list: don't list date formats + + Documentation/git-for-each-ref: don't list date formats + + Documentation/config: don't list date formats + + Documentation/blame-options: don't list date formats "git log --date=local" used to only allow to show the normal (default) format in the local timezone. The command learned to take 'local' as an instruction to use the local timezone with other formats, e.g. "git show --date=rfc-local". + Will merge to 'master'. + * nk/stash-show-config (2015-08-31) 1 commit - - stash: allow "stash show" diff output configurable + (merged to 'next' on 2015-09-08 at 90dd06f) + + stash: allow "stash show" diff output configurable Users who are too busy to type three extra keystrokes to ask for "git stash show -p" can now set stash.showPatch configuration varible to true to always see the actual patch, not just the list of paths affected with feel for the extent of damage via diffstat. + Will merge to 'master'. + -* ls/p4-path-encoding (2015-08-31) 1 commit - . git-p4: add "--path-encoding" option +* ls/p4-path-encoding (2015-09-03) 1 commit + (merged to 'next' on 2015-09-08 at 56514f9) + + git-p4: add config git-p4.pathEncoding "git p4" learned to reencode the pathname it uses to communicate with the p4 depot with a new option. + Will merge to 'master'. + * ad/bisect-terms (2015-08-03) 4 commits (merged to 'next' on 2015-09-01 at ede6e64) @@ -463,16 +501,16 @@ of the repositories listed at * dt/refs-bisection (2015-09-01) 3 commits - - refs: make refs/bisect/* per-worktree - - path: optimize common dir checking - - refs: clean up common_list + (merged to 'next' on 2015-09-08 at 2b66bad) + + refs: make refs/bisect/* per-worktree + + path: optimize common dir checking + + refs: clean up common_list Move the refs used during a "git bisect" session to per-worktree hierarchy refs/worktree/* so that independent bisect sessions can be done in different worktrees. - $gmane/276765. We do not need to move (which can break third-party - tools) in order to make the hierarchy per-worktree. + Will merge to 'master'. * ld/p4-import-labels (2015-08-28) 3 commits @@ -506,16 +544,15 @@ of the repositories listed at does and then "tag -l" is reimplemented in terms of "ref-filter". Almost there... - Waiting for a reroll. - ($gmane/276615, $gmane/276529, $gmane/276607, $gmane/276606, etc.) + A reroll exists at v16, but it seems there will be another one. -* nd/ita-cleanup (2015-08-25) 6 commits +* nd/ita-cleanup (2015-09-06) 6 commits - grep: make it clear i-t-a entries are ignored - checkout(-index): do not checkout i-t-a entries - apply: make sure check_preimage() does not leave empty file on error - apply: fix adding new files on i-t-a entries - - Add and use convenient macro ce_intent_to_add() + - add and use a convenience macro ce_intent_to_add() - blame: remove obsolete comment Paths that have been told the index about with "add -N" are not yet @@ -537,7 +574,7 @@ of the repositories listed at Waiting for a reroll. -* bb/remote-get-url (2015-08-05) 1 commit +* bb/remote-get-url (2015-09-04) 1 commit - remote: add get-url subcommand "git remote" learned "get-url" subcommand to show the URL for a @@ -547,18 +584,19 @@ of the repositories listed at ($gmane/275401) -* sb/submodule-helper (2015-08-31) 5 commits - . submodule: implement `module_clone` as a builtin helper - . submodule: implement `module_name` as a builtin helper - . SQUASH??? - . submodule: implement `module_list` as a builtin helper - . Merge 'hv/submodule-config' to 'sb/submodule-helper' +* sb/submodule-helper (2015-09-08) 4 commits + - submodule: rewrite `module_clone` shell function in C + - submodule: rewrite `module_name` shell function in C + - submodule: rewrite `module_list` shell function in C + - Merge 'hv/submodule-config' to 'sb/submodule-helper' The infrastructure to rewrite "git submodule" in C is being built incrementally. Let's polish these early parts well enough and make them graduate to 'next' and 'master', so that the more involved follow-up can start cooking on a solid ground. + Looked ready for 'next'. Comments from others? + * ad/cygwin-wants-rename (2015-08-07) 1 commit - config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES @@ -589,6 +627,8 @@ of the repositories listed at implementation can be shared across all three, in a follow-up series or two. + Will merge to 'master'. + * jc/rerere (2015-07-24) 21 commits (merged to 'next' on 2015-08-26 at 8ae15ef)