user/sven/git.git/t, branch v2.7.0-rc2

Merge branch 'bc/format-patch-null-from-line'

2015-12-21T18:59:08Z

"format-patch" has learned a new option to zero-out the commit object name on the mbox "From " line. * bc/format-patch-null-from-line: format-patch: check that header line has expected format format-patch: add an option to suppress commit hash sha1_file.c: introduce a null_oid constant

Merge branch 'mc/push-recurse-submodules-config'

2015-12-21T18:59:05Z

Add new config to avoid typing "--recurse-submodules" on each push. * mc/push-recurse-submodules-config: push: follow the "last one wins" convention for --recurse-submodules push: test that --recurse-submodules on command line overrides config push: add recurseSubmodules config option

Merge branch 'fr/rebase-i-continue-preserve-options'

2015-12-16T22:42:52Z

"git rebase -i" started with merge strategy options did not propagate them upon "git rebase --continue". * fr/rebase-i-continue-preserve-options: rebase -i: remember merge options beyond continue actions

format-patch: check that header line has expected format

2015-12-15T18:03:56Z

The format of the "From " header line is very specific to allow utilities to detect Git-style patches. Add a test that the patches created are in the expected format. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

format-patch: add an option to suppress commit hash

2015-12-15T18:03:40Z

Oftentimes, patches created by git format-patch will be stored in version control or compared with diff. In these cases, two otherwise identical patches can have different commit hashes, leading to diff noise. Teach git format-patch a --zero-commit option that instead produces an all-zero hash to avoid this diff noise. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

Merge branch 'ls/p4-keep-empty-commits'

2015-12-15T16:02:19Z

"git p4" used to import Perforce CLs that touch only paths outside the client spec as empty commits. It has been corrected to ignore them instead, with a new configuration git-p4.keepEmptyCommits as a backward compatibility knob. * ls/p4-keep-empty-commits: git-p4: add option to keep empty commits

rebase -i: remember merge options beyond continue actions

2015-12-11T20:44:44Z

If the user explicitly specified a merge strategy or strategy options, continue to use that strategy/option after "rebase --continue". Add a test of the corrected behavior. If --merge is specified or implied by -s or -X, then "strategy and "strategy_opts" are set to values from which "strategy_args" can be derived; otherwise they are set to empty strings. Either way, their values are propagated from one step of an interactive rebase to the next via state files. "do_merge", on the other hand, is *not* propagated to later steps of an interactive rebase. Therefore, making the initialization of "strategy_args" conditional on "do_merge" being set prevents later steps of an interactive rebase from setting it correctly. Luckily, we don't need the "do_merge" guard at all. If the rebase was started without --merge, then "strategy" and "strategy_opts" are both the empty string, which results in "strategy_args" also being set to the empty string, which is just what we want in that situation. So remove the "do_merge" guard and derive "strategy_args" from "strategy" and "strategy_opts" every time. Reported-by: Diogo de Campos Signed-off-by: Fabian Ruch Helped-by: Michael Haggerty Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano

Merge branch 'cb/t3404-shellquote' into maint

2015-12-11T19:14:18Z

* cb/t3404-shellquote: t3404: fix quoting of redirect for some versions of bash

Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maint

2015-12-11T19:14:10Z

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. * jk/test-lint-forbid-when-finished-in-subshell: 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

Merge branch 'cb/t3404-shellquote'

2015-12-11T18:40:58Z

* cb/t3404-shellquote: t3404: fix quoting of redirect for some versions of bash