| commit | cee683b72eac1a1ac0fcbaabf5256a5f0aff07f7 | |
| author | Yann Droneaud <ydroneaud@opteya.com> | |
| Sun, 24 Mar 2013 21:06:12 +0000 (24 22:06 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Mar 2013 15:50:54 +0000 (25 08:50 -0700) | ||
| tree | a2eda6ba0b663d28d73047211bc39d3b5241972c | treesnapshot (tar.gz zip) |
| parent | e023a31de6acdc53c006efe231acc5257740d3b0 | commitdiff |
t7600: use test_config to set/unset git config variables
Instead of using construct such as:
test_when_finished "git config --unset <key>"
git config <key> <value>
uses
test_config <key> <value>
The latter takes care of removing <key> at the end of the test.
Tests are modified to assume default configuration at entry,
and to reset the modified configuration variables at the end.
Test 'merge log message' was relying on the presence of option `--no-ff`
in the configuration. With the option, git show -s --pretty=format:%b HEAD
produces an empty line and without the option, it produces an empty file.
The test is modified to check with and without `--no-ff` option.
Signed-off-by: Yann Droneaud <ydroneaud@opteya.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Instead of using construct such as:
test_when_finished "git config --unset <key>"
git config <key> <value>
uses
test_config <key> <value>
The latter takes care of removing <key> at the end of the test.
Tests are modified to assume default configuration at entry,
and to reset the modified configuration variables at the end.
Test 'merge log message' was relying on the presence of option `--no-ff`
in the configuration. With the option, git show -s --pretty=format:%b HEAD
produces an empty line and without the option, it produces an empty file.
The test is modified to check with and without `--no-ff` option.
Signed-off-by: Yann Droneaud <ydroneaud@opteya.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7600-merge.sh | diffblobblamehistory |