To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (May 2014, #03; Tue, 13)
-X-master-at: 6308767f0bb58116cb405e1f4f77f5dfc1589920
-X-next-at: 7b9918a45049db8fa9b101e28a314928c31e0b5f
+Subject: What's cooking in git.git (May 2014, #04; Wed, 21)
+X-master-at: 4a28f169ad29ba452e0e7bea2583914c10c58322
+X-next-at: daf83cafd8ed3cb640a2047d5069cdbf9d18e7c0
-What's cooking in git.git (May 2014, #03; Tue, 13)
+What's cooking in git.git (May 2014, #04; Wed, 21)
--------------------------------------------------
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 is at v2.0.0-rc3, which is in sync
-with v1.9.3 with respect to bugfixes that was also tagged today.
-Hopefully we can tag v2.0.0 final late next week.
+The tip of the 'master' branch has past v2.0.0-rc4, as there were
+last minute regressions to be taken care of. Hopefully we can tag
+v2.0.0 final soonish.
You can find the changes described here in the integration branches
of the repositories listed at
--------------------------------------------------
[New Topics]
-* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
- - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
- - git-add--interactive: Preserve diff heading when splitting hunks
+* sk/wincred (2014-05-14) 2 commits
+ (merged to 'next' on 2014-05-21 at a3b9ca3)
+ + wincred: avoid overwriting configured variables
+ + wincred: add install target
- Waiting for a reroll.
+ Will keep in 'next' for the remainder of the cycle.
-* jk/do-not-run-httpd-tests-as-root (2014-05-12) 1 commit
- - t/lib-httpd: require SANITY prereq
+* as/pretty-truncate (2014-05-21) 5 commits
+ - pretty.c: format string with truncate respects logOutputEncoding
+ - t4205, t6006: add tests that fail with i18n.logOutputEncoding set
+ - t4205 (log-pretty-format): use `tformat` rather than `format`
+ - t4041, t4205, t6006, t7102: don't hardcode tested encoding value
+ - t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
Will merge to 'next' and keep it there for the rest of this cycle.
-* jk/index-pack-report-missing (2014-05-12) 1 commit
- - index-pack: distinguish missing objects from type errors
+* cc/replace-graft (2014-05-19) 1 commit
+ (merged to 'next' on 2014-05-21 at 7d90c4e)
+ + replace: add --graft option
+ (this branch uses cc/replace-edit.)
- Will merge to 'next' and keep it there for the rest of this cycle.
+ Will keep in 'next' for the remainder of the cycle.
-* tb/unicode-6.3-zero-width (2014-05-12) 2 commits
- - utf8: make it easier to auto-update git_wcwidth()
- - utf8.c: use a table for double_width
- Update the logic to compute the display width needed for utf8
- strings and allow us to more easily maintain the tables used in
- that logic.
+* jk/argv-array-for-child-process (2014-05-15) 7 commits
+ (merged to 'next' on 2014-05-21 at 5b2fa64)
+ + argv-array: drop "detach" code
+ + get_importer: use run-command's internal argv_array
+ + get_exporter: use argv_array
+ + get_helper: use run-command's internal argv_array
+ + git_connect: use argv_array
+ + run_column_filter: use argv_array
+ + run-command: store an optional argv_array
- We may want to let the users choose if codepoints with ambiguous
- widths are treated as a double or single width in a follow-up patch.
+ Will keep in 'next' for the remainder of the cycle.
- Will merge to 'next' and keep it there for the rest of this cycle.
+* jk/diff-files-assume-unchanged (2014-05-15) 1 commit
+ (merged to 'next' on 2014-05-21 at 142d2c8)
+ + run_diff_files: do not look at uninitialized stat data
+
+ Will keep in 'next' for the remainder of the cycle.
-* mk/show-s-no-extra-blank-line-for-merges (2014-05-13) 3 commits
- - fixup! git-show: fix 'git show -s' to not add extra terminator after merge commit
- - t: git-show: adapt tests to fixed 'git show'
- - git-show: fix 'git show -s' to not add extra terminator after merge commit
- Waiting for a reroll.
+* jk/report-fail-to-read-objects-better (2014-05-15) 1 commit
+ (merged to 'next' on 2014-05-21 at 77c89fe)
+ + open_sha1_file: report "most interesting" errno
+ Will keep in 'next' for the remainder of the cycle.
-* wk/doc-clarify-upstream (2014-05-13) 1 commit
- - Documentation: mention config sources for @{upstream}
+
+* mt/rebase-i-keep-empty-test (2014-05-19) 1 commit
+ (merged to 'next' on 2014-05-21 at d87d266)
+ + rebase --keep-empty -i: add test
+
+ Will keep in 'next' for the remainder of the cycle.
+
+
+* nd/status-auto-comment-char (2014-05-19) 2 commits
+ (merged to 'next' on 2014-05-21 at f762e62)
+ + commit: allow core.commentChar=auto for character auto selection
+ + config: be strict on core.commentChar
+
+ Will keep in 'next' for the remainder of the cycle.
+
+
+* rr/rebase-autostash-fix (2014-05-20) 2 commits
+ (merged to 'next' on 2014-05-21 at ca4aa40)
+ + rebase -i: test "Nothing to do" case with autostash
+ + rebase -i: handle "Nothing to do" case with autostash
+
+ Will keep in 'next' for the remainder of the cycle.
+
+
+* sk/spawn-less-case-insensitively-from-grep-O-i (2014-05-15) 1 commit
+ (merged to 'next' on 2014-05-21 at eb28305)
+ + git grep -O -i: if the pager is 'less', pass the '-I' option
+
+ Will keep in 'next' for the remainder of the cycle.
+
+
+* sk/windows-unc-path (2014-05-20) 1 commit
+ (merged to 'next' on 2014-05-21 at d1f1350)
+ + Windows: Allow using UNC path for git repository
+
+ Will keep in 'next' for the remainder of the cycle.
+
+
+* jk/diff-follow-must-take-one-pathspec (2014-05-20) 1 commit
+ - move "--follow needs one pathspec" rule to diff_setup_done
Will merge to 'next' and keep it there for the rest of this cycle.
* jk/makefile (2014-02-05) 16 commits
- - FIXUP
- - move LESS/LV pager environment to Makefile
- - Makefile: teach scripts to include make variables
- - FIXUP
- - Makefile: auto-build C strings from make variables
- - Makefile: drop *_SQ variables
- - FIXUP
- - Makefile: add c-quote helper function
- - Makefile: introduce sq function for shell-quoting
- - Makefile: always create files via make-var
- - Makefile: store GIT-* sentinel files in MAKE/
- - Makefile: prefer printf to echo for GIT-*
- - Makefile: use tempfile/mv strategy for GIT-*
- - Makefile: introduce make-var helper function
- - Makefile: fix git-instaweb dependency on gitweb
- - Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
+ . FIXUP
+ . move LESS/LV pager environment to Makefile
+ . Makefile: teach scripts to include make variables
+ . FIXUP
+ . Makefile: auto-build C strings from make variables
+ . Makefile: drop *_SQ variables
+ . FIXUP
+ . Makefile: add c-quote helper function
+ . Makefile: introduce sq function for shell-quoting
+ . Makefile: always create files via make-var
+ . Makefile: store GIT-* sentinel files in MAKE/
+ . Makefile: prefer printf to echo for GIT-*
+ . Makefile: use tempfile/mv strategy for GIT-*
+ . Makefile: introduce make-var helper function
+ . Makefile: fix git-instaweb dependency on gitweb
+ . Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
Simplify the Makefile rules and macros that exist primarily for
quoting purposes, and make it easier to robustly express the
Meant to be used as a basis for whatever Ram wants to build on.
- Ejected from 'pu' to make room for fc/publish-vs-upstream topic.
+ Ejected from 'pu' to unclutter.
+
+
+* fc/publish-vs-upstream (2014-04-21) 8 commits
+ . sha1_name: add support for @{publish} marks
+ . sha1_name: simplify track finding
+ . sha1_name: cleanup interpret_branch_name()
+ . branch: display publish branch
+ . push: add --set-publish option
+ . branch: add --set-publish-to option
+ . Add concept of 'publish' branch
+ . t5516 (fetch-push): fix test restoration
+
+ Add branch@{publish}; it seems that this is somewhat different from
+ Ram and Peff started working on. At least the tip needs to be
+ rerolled not to squat on @{p} which @{push} and possibly @{pull}
+ may want to share.
+
+ Ejected from 'pu' to unclutter.
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
--------------------------------------------------
[Cooking]
+* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
+ - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
+ - git-add--interactive: Preserve diff heading when splitting hunks
+
+ Waiting for a reroll.
+
+
+* jk/do-not-run-httpd-tests-as-root (2014-05-12) 1 commit
+ (merged to 'next' on 2014-05-21 at 676392b)
+ + t/lib-httpd: require SANITY prereq
+
+ Will keep in 'next' for the remainder of the cycle.
+
+
+* jk/index-pack-report-missing (2014-05-12) 1 commit
+ (merged to 'next' on 2014-05-14 at 72d40e1)
+ + index-pack: distinguish missing objects from type errors
+
+ Will keep in 'next' for the remainder of the cycle.
+
+
+* tb/unicode-6.3-zero-width (2014-05-12) 2 commits
+ (merged to 'next' on 2014-05-14 at 08e0171)
+ + utf8: make it easier to auto-update git_wcwidth()
+ + utf8.c: use a table for double_width
+
+ Update the logic to compute the display width needed for utf8
+ strings and allow us to more easily maintain the tables used in
+ that logic.
+
+ We may want to let the users choose if codepoints with ambiguous
+ widths are treated as a double or single width in a follow-up patch.
+
+ Will keep in 'next' for the remainder of the cycle.
+
+
+* mk/show-s-no-extra-blank-line-for-merges (2014-05-15) 1 commit
+ (merged to 'next' on 2014-05-21 at 3b98b35)
+ + git-show: fix 'git show -s' to not add extra terminator after merge commit
+
+ Will keep in 'next' for the remainder of the cycle.
+
+
+* wk/doc-clarify-upstream (2014-05-13) 1 commit
+ (merged to 'next' on 2014-05-14 at 6c8fb52)
+ + Documentation: mention config sources for @{upstream}
+
+ Will keep in 'next' for the remainder of the cycle.
+
+
* dk/raise-core-deltabasecachelimit (2014-05-06) 1 commit
(merged to 'next' on 2014-05-12 at 97ec92a)
+ Bump core.deltaBaseCacheLimit to 96m
Will keep in 'next' for the remainder of the cycle.
-* fc/remote-hg-fixes-for-hg-3.0 (2014-05-08) 5 commits
- - [DONTMERGE-not signed-off] remote-hg: work with older versions of mercurial
- - remote-hg: add support for hg v3.0
- - t: remote-hg: trivial cleanups and fixes
- - t: remote-hg: add file operation tests
- - remote-hg: add more tests
-
- Update remote-hg helper to work with newer versions of Mercurial,
- and fixes an incompatibility with older versions triggered by new
- tests.
-
-
* fc/status-printf-squelch-format-zero-length-warnings (2014-05-07) 1 commit
(merged to 'next' on 2014-05-12 at 6b04e23)
+ silence a bunch of format-zero-length warnings
* sk/submodules-absolute-path-on-windows (2014-05-08) 1 commit
- - Revert "submodules: fix ambiguous absolute paths under Windows"
+ (merged to 'next' on 2014-05-14 at 83a05d9)
+ + Revert "submodules: fix ambiguous absolute paths under Windows"
- Will merge to 'next' and keep it there for the rest of this cycle.
+ Will keep in 'next' for the remainder of the cycle.
* jn/contrib-remove-diffall (2014-05-09) 1 commit
- SQUASH typofix
- How to keep a project's canonical history correct.
+ Will squash and then merge to 'next'.
+
* wg/svn-fe-style-fixes (2014-05-12) 1 commit
(merged to 'next' on 2014-05-12 at 88c0e0d)
Will keep in 'next' for the remainder of the cycle.
-* jc/coding-guidelines (2014-05-02) 8 commits
+* jc/coding-guidelines (2014-05-20) 9 commits
+ - CodingGuidelines: avoid "test <cond> -a/-o <cond>"
(merged to 'next' on 2014-05-12 at e1fcf62)
+ CodingGuidelines: on splitting a long line
+ CodingGuidelines: on comparison
+ CodingGuidelines: give an example for case/esac statement
+ CodingGuidelines: once it is in, it is not worth the code churn
- Will keep in 'next' for the remainder of the cycle.
+ Will merge to 'next' and keep it there for the rest of this cycle.
* jd/subtree (2014-05-13) 6 commits
- - contrib/subtree: allow adding an annotated tag
+ (merged to 'next' on 2014-05-14 at 977db74)
+ + contrib/subtree: allow adding an annotated tag
(merged to 'next' on 2014-05-07 at 81b375d)
+ contrib/subtree/Makefile: clean up rule for "clean"
+ contrib/subtree/Makefile: clean up rules to generate documentation
Will keep in 'next' for the remainder of the cycle.
-* cc/replace-edit (2014-04-29) 4 commits
+* cc/replace-edit (2014-05-19) 10 commits
+ (merged to 'next' on 2014-05-19 at fcdd83f)
+ + Documentation: replace: describe new --edit option
+ + replace: add --edit to usage string
+ + replace: add tests for --edit
+ + replace: die early if replace ref already exists
+ + replace: refactor checking ref validity
+ + replace: make sure --edit results in a different object
(merged to 'next' on 2014-05-12 at 71449bf)
+ replace: add --edit option
+ replace: factor object resolution out of replace_object
+ replace: use OPT_CMDMODE to handle modes
+ replace: refactor command-mode determination
+ (this branch is used by cc/replace-graft.)
"git replace" learns a new "--edit" option.
* dk/blame-reorg (2014-04-28) 1 commit
- - blame: large-scale performance rewrite
+ (merged to 'next' on 2014-05-14 at 354a0e3)
+ + blame: large-scale performance rewrite
- Will merge to 'next' and keep it there for the rest of this cycle.
+ Will keep in 'next' for the remainder of the cycle.
* je/pager-do-not-recurse (2014-04-28) 1 commit
* bc/blame-crlf-test (2014-05-08) 1 commit
- - blame: correctly handle files regardless of autocrlf
+ (merged to 'next' on 2014-05-14 at b819505)
+ + blame: correctly handle files regardless of autocrlf
If a file contained CRLF line endings in a repository with
core.autocrlf=input, then blame always marked lines as "Not
Committed Yet", even if they were unmodified.
- Will merge to 'next' and keep it there for the rest of this cycle.
-
-
-* rs/ref-transaction (2014-04-29) 27 commits
- - refs.c: make lock_ref_sha1 static
- - refs.c: make write_ref_sha1 static
- - walker.c: use ref transaction for ref updates
- - fast-import.c: use a ref transaction when dumping tags
- - receive-pack.c: use a reference transaction for updating the refs
- - fetch.c: use a single ref transaction for all ref updates
- - fetch.c: change s_update_ref to use a ref transaction
- - fetch.c: clear errno before calling functions that might set it
- - refs.c: ref_transaction_commit should not free the transaction
- - refs.c: free the transaction before returning when number of updates is 0
- - refs.c: change update_ref to use a transaction
- - 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: remove the onerr argument to ref_transaction_commit
- - refs.c: make update_ref_write update a strbuf on failure
- - update-ref.c: log transaction error from the update_ref
- - refs.c: make ref_update_reject_duplicates take a strbuf argument for errors
- - refs.c: add a strbuf argument to ref_transaction_commit for error logging
- - refs.c: allow passing NULL to ref_transaction_free
- - refs.c: constify the sha arguments for ref_transaction_create|delete|update
- (this branch uses mh/ref-transaction.)
-
- Updates most of the callsites to write_sha1_ref(), the low-level
- mechanism to update a ref, to use the ref-transaction API.
-
- Expecting a reroll.
+ Will keep in 'next' for the remainder of the cycle.
* ep/shell-command-substitution (2014-04-30) 41 commits
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-'").
+ Needs a reroll/squash to fix bash-isms.
+
* mm/mediawiki-encoding-fix (2014-04-23) 2 commits
(merged to 'next' on 2014-05-02 at 7744361)
Will keep in 'next' for the remainder of the cycle.
-* fc/remote-helpers-hg-bzr-graduation (2014-04-29) 11 commits
- - remote-hg: trivial cleanups
- - remote-hg: make sure we omit multiple heads
- - git-remote-hg: use internal clone's hgrc
- - t: remote-hg: split into setup test
- - remote-hg: properly detect missing contexts
- - remote-{hg,bzr}: store marks only on success
- - remote-hg: update to 'public' phase when pushing
- - remote-hg: fix parsing of custom committer
- (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
-
- As there were announcements for these two to be maintained as
- independent third-party projects ($gmane/248561, $gmane/248583),
- this topic would need to be discarded after 2.0 final, and copies
- in contrib/remote-helpers/ may need to be replaced with a README
- with pointers to their canonical repository.
-
-
* fc/remote-helper-refmap (2014-04-21) 8 commits
(merged to 'next' on 2014-04-22 at fb5a4c2)
+ transport-helper: remove unnecessary strbuf resets
Will keep in 'next' for the remainder of the cycle.
-* fc/publish-vs-upstream (2014-04-21) 8 commits
- - sha1_name: add support for @{publish} marks
- - sha1_name: simplify track finding
- - sha1_name: cleanup interpret_branch_name()
- - branch: display publish branch
- - push: add --set-publish option
- - branch: add --set-publish-to option
- - Add concept of 'publish' branch
- - t5516 (fetch-push): fix test restoration
-
- Add branch@{publish}; it seems that this is somewhat different from
- Ram and Peff started working on. There were many discussion
- messages going back and forth but it does not appear that the
- design issues have been worked out among participants yet.
-
-
* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
- git-gui: show staged submodules regardless of ignore config
+ parse_arg(): really test that argument is properly terminated
+ t1400: provide more usual input to the command
+ t1400: fix name and expected result of one test
- (this branch is used by rs/ref-transaction.)
Update "update-ref --stdin [-z]" and then introduce a transactional
support for (multi-)reference updates.
this, but it was easy enough to cobble together. Tests, docs and
stripping out more MIMEy stuff are left as exercises to interested
parties.
+
+
+* jc/graduate-remote-hg-bzr (2014-05-19) 1 commit
+ (merged to 'next' on 2014-05-19 at eeb9af6)
+ + remote-helpers: give short instructions to download the latest
+
+ Reverted from 'next'.
+
+
+* mt/rebase-i-ack (2014-05-19) 6 commits
+ . git-ack: record an ack
+ . rebase: test ack
+ . git-rebase: document ack
+ . rebase -i: add ack action
+ + test: add test_write_lines helper
+ + patch-id: make it stable against hunk reordering
+ (this branch is tangled with mt/patch-id-stable.)
+
+ Will be rerolled post 2.0
+
+
+* fc/remote-hg-fixes-for-hg-3.0 (2014-05-08) 5 commits
+ . [DONTMERGE-not signed-off] remote-hg: work with older versions of mercurial
+ . remote-hg: add support for hg v3.0
+ . t: remote-hg: trivial cleanups and fixes
+ . t: remote-hg: add file operation tests
+ . remote-hg: add more tests
+
+ No longer relevant, as 'master' unbundles contrib/remote-helpers/.
+
+
+* rs/ref-transaction (2014-04-29) 27 commits
+ . refs.c: make lock_ref_sha1 static
+ . refs.c: make write_ref_sha1 static
+ . walker.c: use ref transaction for ref updates
+ . fast-import.c: use a ref transaction when dumping tags
+ . receive-pack.c: use a reference transaction for updating the refs
+ . fetch.c: use a single ref transaction for all ref updates
+ . fetch.c: change s_update_ref to use a ref transaction
+ . fetch.c: clear errno before calling functions that might set it
+ . refs.c: ref_transaction_commit should not free the transaction
+ . refs.c: free the transaction before returning when number of updates is 0
+ . refs.c: change update_ref to use a transaction
+ . 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: remove the onerr argument to ref_transaction_commit
+ . refs.c: make update_ref_write update a strbuf on failure
+ . update-ref.c: log transaction error from the update_ref
+ . refs.c: make ref_update_reject_duplicates take a strbuf argument for errors
+ . refs.c: add a strbuf argument to ref_transaction_commit for error logging
+ . refs.c: allow passing NULL to ref_transaction_free
+ . refs.c: constify the sha arguments for ref_transaction_create|delete|update
+ (this branch uses mh/ref-transaction; is tangled with rs/ref-transaction-2.)
+
+ Temporarily dropped; there are a lot of conflicts with topics in
+ flight, and the topic is still being worked on with frequent
+ rerolls. Will pick up a reroll once things settle down a bit after
+ the release.
+
+
+* fc/remote-helpers-hg-bzr-graduation (2014-04-29) 11 commits
+ . remote-hg: trivial cleanups
+ . remote-hg: make sure we omit multiple heads
+ . git-remote-hg: use internal clone's hgrc
+ . t: remote-hg: split into setup test
+ . remote-hg: properly detect missing contexts
+ . remote-{hg,bzr}: store marks only on success
+ . remote-hg: update to 'public' phase when pushing
+ . remote-hg: fix parsing of custom committer
+ (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
+
+ No longer relevant, as 'master' unbundles contrib/remote-helpers/.
projects / thirdparty / git.git / commitdiff
