From 7152a4263093cb8f0812318e4f5872f07c1da0c5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 25 Apr 2014 15:13:42 -0700 Subject: [PATCH] What's cooking (2014/04 #08) --- whats-cooking.txt | 399 +++++++++++++++++++++++++++++------------------------- 1 file changed, 214 insertions(+), 185 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 006bedafb7..6b0d7b19eb 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,21 +1,18 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Apr 2014, #07; Tue, 22) -X-master-at: 779792a5f24bb4e8049c4f88ad752e70d4a8a080 -X-next-at: 4f984835015ed69c2885f183cdc0198f90d08135 +Subject: What's cooking in git.git (Apr 2014, #08; Fri, 25) +X-master-at: 35936f8fc38a214cc7d2595070641d39a541dfb1 +X-next-at: 6b2797783cb3e61a56a96669ce7848480f49f38f -What's cooking in git.git (Apr 2014, #07; Tue, 22) +What's cooking in git.git (Apr 2014, #08; Fri, 25) -------------------------------------------------- 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 tip of the 'master' branch has passed v2.0.0-rc0, an early -preview release. There are a handful of topics still in 'next' (and -a few that are not in 'next') that I'd like to have in v2.0.0-rc1, -but other than that, this hopefully is fairly a close approximation -of the upcoming release. +The tip of the 'master' branch is at v2.0.0-rc1. Last minute fixes +to newly added code keep flowing in, which is good. You can find the changes described here in the integration branches of the repositories listed at @@ -23,186 +20,120 @@ of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -------------------------------------------------- -[New Topics] +[Graduated to "master"] -* fc/remote-helpers-hg-bzr-graduation (2014-04-21) 3 commits - - remote-helpers: move tests out of contrib - - remote-helpers: move out of contrib - - remote-helpers: squelch python import exceptions +* db/make-with-curl (2014-04-15) 2 commits + (merged to 'next' on 2014-04-16 at b9c8527) + + Makefile: allow static linking against libcurl + + Makefile: use curl-config to determine curl flags - Move remote-hg and remote-bzr out of contrib/. + Ask curl-config how to link with the curl library, instead of + having only a limited configurability knobs in the Makefile. - Will merge to 'next' and keep it there for the remainder of the cycle. +* fc/transport-helper-sync-error-fix (2014-04-21) 6 commits + (merged to 'next' on 2014-04-21 at f53a08a) + + t5801 (remote-helpers): cleanup environment sets + + transport-helper: fix sync issue on crashes + + transport-helper: trivial cleanup + + transport-helper: propagate recvline() error pushing + + remote-helpers: make recvline return an error + + transport-helper: remove barely used xchgline() -* rs/ref-transaction (2014-04-22) 14 commits - . SQUASH??? - . refs.c: change update_ref to use a transaction - . walker.c: use ref transaction for ref updates - . branch.c: use ref transaction for all ref updates - . fast-import.c: change update_branch to use ref transactions - . sequencer.c: use ref transactions for all ref updates - . commit.c: use ref transactions for updates - . replace.c: use the ref transaction functions for updates - . tag.c: use ref transactions when doing updates - . refs.c: ref_transaction_delete to check for error and return status - . refs.c: change ref_transaction_create to do error checking and return status - . refs.c: change ref_transaction_update() to do error checking and return status - . refs.c: use a single exit path from transaction commit and handle onerr - . refs.c: constify the sha arguments for ref_transaction_create|delete|update - (this branch uses mh/ref-transaction.) + Make sure the marks are not written out when the transport helper + did not finish happily, to avoid marks file that is out of sync + with the reality. - Updates most of the callsites to write_sha1_ref(), the low-level - mechanism to update a ref, to use the ref-transaction API. - Seems to break the dumb walker test (t5550) when merged to 'pu', - possibly due to misconversion of walker.c. Kept out of 'pu' as I - didn't want to resolve conflicts with the other topics only to get - a known-broken version. +* jk/pack-bitmap (2014-04-22) 1 commit + (merged to 'next' on 2014-04-22 at ba58737) + + ewah_bitmap.c: do not assume size_t and eword_t are the same size + A last minute (and hopefully the last) fix to avoid coredumps due + to an incorrect pointer arithmetic. -* fc/remote-helper-refmap (2014-04-21) 8 commits - - transport-helper: remove unnecessary strbuf resets - - transport-helper: add support to delete branches - - fast-export: add support to delete refs - - fast-import: add support to delete refs - - transport-helper: add support to push symbolic refs - - transport-helper: add support for old:new refspec - - fast-export: add new --refspec option - - fast-export: improve argument parsing +-------------------------------------------------- +[New Topics] - Allow remote-helper/fast-import based transport to rename the refs - while transferring the history. +* ep/shell-command-substitution (2014-04-23) 13 commits + - p5302-pack-index.sh: use the $( ... ) construct for command substitution + - lib-gpg.sh: use the $( ... ) construct for command substitution + - lib-cvs.sh: use the $( ... ) construct for command substitution + - lib-credential.sh: use the $( ... ) construct for command substitution + - git-web--browse.sh: use the $( ... ) construct for command substitution + - git-stash.sh: use the $( ... ) construct for command substitution + - git-rebase.sh: use the $( ... ) construct for command substitution + - git-rebase--merge.sh: use the $( ... ) construct for command substitution + - git-pull.sh: use the $( ... ) construct for command substitution + - appp.sh: use the $( ... ) construct for command substitution + - t7900-subtree.sh: use the $( ... ) construct for command substitution + - test-gitmw-lib.sh: use the $( ... ) construct for command substitution + - t9365-continuing-queries.sh: use the $( ... ) construct for command substitution + + Adjust shell scripts to use $(cmd) instead of `cmd`. Will merge to 'next' and keep it there for the remainder of the cycle. -* jk/external-diff-use-argv-array (2014-04-21) 6 commits - - run_external_diff: refactor cmdline setup logic - - run_external_diff: hoist common bits out of conditional - - run_external_diff: drop fflush(NULL) - - run_external_diff: clean up error handling - - run_external_diff: use an argv_array for the environment - - run_external_diff: use an argv_array for the command line - - Code clean-up. +* ib/test-selectively-run (2014-04-23) 3 commits + - test-lib: '--run' to run only specific tests + - test-lib: tests skipped by GIT_SKIP_TESTS say so + - test-lib: Document short options in t/README - Will keep in 'next' for the remainder of the cycle. + Allow specifying only certain individual test pieces to be run + using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'"). -* jx/blame-align-relative-time (2014-04-22) 2 commits - - blame: dynamic blame_date_width for different locales - - blame:: fix broken time_buf paddings in relative timestamp - - "git blame" miscounted number of columns needed to show localized - timestamps, resulting in jaggy left-side-edge of the source code - lines in its output. +* mm/mediawiki-encoding-fix (2014-04-23) 2 commits + - git-remote-mediawiki: fix encoding issue for UTF-8 media files + - git-remote-mediawiki: allow stop/start-ing the test server Will merge to 'next' and keep it there for the remainder of the cycle. -* fc/merge-default-to-upstream (2014-04-22) 1 commit - (merged to 'next' on 2014-04-22 at 4f98483) - + merge: enable defaulttoupstream by default - - "git merge" without argument, even when there is an upstream - defined for the current branch, refused to run until - merge.defaultToUpstream is set to true. Flip the default of that - configuration variable to true. - - Will keep in 'next' for the remainder of the cycle. - - -* fc/mergetool-prompt (2014-04-22) 1 commit - (merged to 'next' on 2014-04-22 at dcaec94) - + mergetool: run prompt only if guessed tool - - mergetool.prompt used to default to 'true', always causing a confirmation - "do you really want to run the tool on this path" to be shown. - - Among the two purposes the prompt serves, ignore the use case to - confirm that the user wants to view particular path with the named - tool, and make the prompt only to confirm the choice of the tool - made by autodetection and defaulting. For those who configured the - tool explicitly, the prompt shown for the latter purpose is simply - annoying. - - Strictly speaking, this is a backward incompatible change and the - users need to explicitly set the variable to 'true' if they want to - resurrect the now-ignored use case. - - Will keep in 'next' for the remainder of the cycle. - - -* fc/mergetools-vimdiff3 (2014-04-22) 1 commit - (merged to 'next' on 2014-04-22 at d843e75) - + mergetools: add vimdiff3 mode - - Will keep in 'next' for the remainder of the cycle. - +* mw/symlinks (2014-04-24) 1 commit + (merged to 'next' on 2014-04-25 at 20b2af6) + + setup: fix windows path buffer over-stepping -* km/git-svn-workaround-older-getopt-long (2014-04-22) 1 commit - - t9117: use --prefix "" instead of --prefix="" + A finishing touch fix to a new change already in 'master'. - Will merge to 'next' and hopefully merge to 'master' by -rc2 if not earlier. + Will merge to 'master' by -rc2. -* lr/git-run-setup-gently (2014-04-22) 1 commit - - git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive +* sk/tag-contains-wo-recursion (2014-04-25) 1 commit + (merged to 'next' on 2014-04-25 at f320750) + + git tag --contains: avoid stack overflow Will keep in 'next' for the remainder of the cycle. +-------------------------------------------------- +[Stalled] -* mk/doc-git-gui-display-untracked (2014-04-21) 1 commit - - Documentation: git-gui: describe gui.displayuntracked - - Will merge to 'next' and hopefully merge to 'master' by -rc2 if not earlier. - - -* rh/prompt-pcmode-avoid-eval-on-refname (2014-04-22) 1 commit - - git-prompt.sh: don't put unsanitized branch names in $PS1 - - Will merge to 'next' and hopefully merge to 'master' by -rc2 if not earlier. +* rs/ref-transaction (2014-04-22) 14 commits + . SQUASH??? + . refs.c: change update_ref to use a transaction + . walker.c: use ref transaction for ref updates + . branch.c: use ref transaction for all ref updates + . fast-import.c: change update_branch to use ref transactions + . sequencer.c: use ref transactions for all ref updates + . commit.c: use ref transactions for updates + . replace.c: use the ref transaction functions for updates + . tag.c: use ref transactions when doing updates + . refs.c: ref_transaction_delete to check for error and return status + . refs.c: change ref_transaction_create to do error checking and return status + . refs.c: change ref_transaction_update() to do error checking and return status + . refs.c: use a single exit path from transaction commit and handle onerr + . refs.c: constify the sha arguments for ref_transaction_create|delete|update + (this branch uses mh/ref-transaction.) --------------------------------------------------- -[Graduated to "master"] + Updates most of the callsites to write_sha1_ref(), the low-level + mechanism to update a ref, to use the ref-transaction API. -* ep/shell-command-substitution (2014-04-17) 14 commits - (merged to 'next' on 2014-04-18 at ebd996d) - + t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command substitution - + t9360-mw-to-git-clone.sh: use the $( ... ) construct for command substitution - + git-tag.sh: use the $( ... ) construct for command substitution - + git-revert.sh: use the $( ... ) construct for command substitution - + git-resolve.sh: use the $( ... ) construct for command substitution - + git-repack.sh: use the $( ... ) construct for command substitution - + git-merge.sh: use the $( ... ) construct for command substitution - + git-ls-remote.sh: use the $( ... ) construct for command substitution - + git-fetch.sh: use the $( ... ) construct for command substitution - + git-commit.sh: use the $( ... ) construct for command substitution - + git-clone.sh: use the $( ... ) construct for command substitution - + git-checkout.sh: use the $( ... ) construct for command substitution - + install-webdoc.sh: use the $( ... ) construct for command substitution - + howto-index.sh: use the $( ... ) construct for command substitution - - -* jx/i18n (2014-04-18) 4 commits - (merged to 'next' on 2014-04-18 at 2ace126) - + i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelines - + i18n: only extract comments marked with "TRANSLATORS:" - + i18n: remove obsolete comments for translators in diffstat generation - + i18n: fix uncatchable comments for translators in date.c - - -* km/avoid-non-function-return-in-rebase (2014-04-17) 2 commits - (merged to 'next' on 2014-04-18 at 6982c3e) - + Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD" - + rebase: avoid non-function use of "return" on FreeBSD - - Work around /bin/sh that does not like "return" at the top-level - of a file that is dot-sourced from inside a function definition. + Seems to break the dumb walker test (t5550) when merged to 'pu', + possibly due to misconversion of walker.c. Kept out of 'pu' as I + didn't want to resolve conflicts with the other topics only to get + a known-broken version. --------------------------------------------------- -[Stalled] * tr/merge-recursive-index-only (2014-02-05) 3 commits - merge-recursive: -Xindex-only to leave worktree unchanged @@ -371,6 +302,129 @@ of the repositories listed at -------------------------------------------------- [Cooking] +* fc/remote-helpers-hg-bzr-graduation (2014-04-21) 3 commits + (merged to 'next' on 2014-04-22 at fed170a) + + remote-helpers: move tests out of contrib + + remote-helpers: move out of contrib + + remote-helpers: squelch python import exceptions + + Move remote-hg and remote-bzr out of contrib/. + + Will keep in 'next' for the remainder of the cycle. + + +* fc/remote-helper-refmap (2014-04-21) 8 commits + (merged to 'next' on 2014-04-22 at fb5a4c2) + + transport-helper: remove unnecessary strbuf resets + + transport-helper: add support to delete branches + + fast-export: add support to delete refs + + fast-import: add support to delete refs + + transport-helper: add support to push symbolic refs + + transport-helper: add support for old:new refspec + + fast-export: add new --refspec option + + fast-export: improve argument parsing + + Allow remote-helper/fast-import based transport to rename the refs + while transferring the history. + + Will keep in 'next' for the remainder of the cycle. + + +* jk/external-diff-use-argv-array (2014-04-21) 6 commits + (merged to 'next' on 2014-04-22 at e6d92d7) + + run_external_diff: refactor cmdline setup logic + + run_external_diff: hoist common bits out of conditional + + run_external_diff: drop fflush(NULL) + + run_external_diff: clean up error handling + + run_external_diff: use an argv_array for the environment + + run_external_diff: use an argv_array for the command line + + Code clean-up. + + Will keep in 'next' for the remainder of the cycle. + + +* jx/blame-align-relative-time (2014-04-23) 2 commits + (merged to 'next' on 2014-04-23 at 858df39) + + blame: dynamic blame_date_width for different locales + + blame: fix broken time_buf paddings in relative timestamp + + "git blame" miscounted number of columns needed to show localized + timestamps, resulting in jaggy left-side-edge of the source code + lines in its output. + + Will keep in 'next' for the remainder of the cycle. + + +* fc/merge-default-to-upstream (2014-04-22) 1 commit + (merged to 'next' on 2014-04-22 at 4f98483) + + merge: enable defaulttoupstream by default + + "git merge" without argument, even when there is an upstream + defined for the current branch, refused to run until + merge.defaultToUpstream is set to true. Flip the default of that + configuration variable to true. + + Will keep in 'next' for the remainder of the cycle. + + +* fc/mergetool-prompt (2014-04-24) 2 commits + - mergetool: document the default for --[no-]prompt + (merged to 'next' on 2014-04-22 at dcaec94) + + mergetool: run prompt only if guessed tool + + mergetool.prompt used to default to 'true', always causing a confirmation + "do you really want to run the tool on this path" to be shown. + + Among the two purposes the prompt serves, ignore the use case to + confirm that the user wants to view particular path with the named + tool, and make the prompt only to confirm the choice of the tool + made by autodetection and defaulting. For those who configured the + tool explicitly, the prompt shown for the latter purpose is simply + annoying. + + Strictly speaking, this is a backward incompatible change and the + users need to explicitly set the variable to 'true' if they want to + resurrect the now-ignored use case. + + Will merge to 'next' and keep it there for the remainder of the cycle. + + +* fc/mergetools-vimdiff3 (2014-04-22) 1 commit + (merged to 'next' on 2014-04-22 at d843e75) + + mergetools: add vimdiff3 mode + + Will keep in 'next' for the remainder of the cycle. + + +* km/git-svn-workaround-older-getopt-long (2014-04-23) 1 commit + (merged to 'next' on 2014-04-23 at 3f35586) + + t9117: use --prefix "" instead of --prefix="" + + Will merge to 'master' by -rc2. + + +* lr/git-run-setup-gently (2014-04-22) 1 commit + (merged to 'next' on 2014-04-22 at 5c2523f) + + git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive + + Will keep in 'next' for the remainder of the cycle. + + +* mk/doc-git-gui-display-untracked (2014-04-21) 1 commit + (merged to 'next' on 2014-04-22 at 385d39a) + + Documentation: git-gui: describe gui.displayuntracked + + Will merge to 'master' by -rc2. + + +* rh/prompt-pcmode-avoid-eval-on-refname (2014-04-22) 1 commit + (merged to 'next' on 2014-04-22 at 3a1506f) + + git-prompt.sh: don't put unsanitized branch names in $PS1 + + Will merge to 'master' by -rc2. + + * fc/publish-vs-upstream (2014-04-21) 8 commits - sha1_name: add support for @{publish} marks - sha1_name: simplify track finding @@ -411,7 +465,9 @@ of the repositories listed at Expecting a reroll. -* ef/send-email-absolute-path-to-the-command (2014-04-16) 1 commit +* ef/send-email-absolute-path-to-the-command (2014-04-23) 2 commits + (merged to 'next' on 2014-04-23 at a657e5e) + + send-email: windows drive prefix (e.g. C:) appears only at the beginning (merged to 'next' on 2014-04-21 at 43bebb5) + send-email: recognize absolute path on Windows @@ -437,33 +493,6 @@ of the repositories listed at Will keep in 'next' for the remainder of the cycle. -* fc/transport-helper-sync-error-fix (2014-04-21) 6 commits - (merged to 'next' on 2014-04-21 at f53a08a) - + t5801 (remote-helpers): cleanup environment sets - + transport-helper: fix sync issue on crashes - + transport-helper: trivial cleanup - + transport-helper: propagate recvline() error pushing - + remote-helpers: make recvline return an error - + transport-helper: remove barely used xchgline() - - Make sure the marks are not written out when the transport helper - did not finish happily, to avoid marks file that is out of sync - with the reality. - - Will merge to 'master' by -rc1 if no regressions are reported. - - -* db/make-with-curl (2014-04-15) 2 commits - (merged to 'next' on 2014-04-16 at b9c8527) - + Makefile: allow static linking against libcurl - + Makefile: use curl-config to determine curl flags - - Ask curl-config how to link with the curl library, instead of - having only a limited configurability knobs in the Makefile. - - Will merge to 'master' by -rc1 if no regressions are reported. - - * nd/index-pack-one-fd-per-thread (2014-04-16) 1 commit (merged to 'next' on 2014-04-16 at b38d5a9) + index-pack: work around thread-unsafe pread() -- 2.11.4.GIT