diff options
author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2016-02-25 09:59:21 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-02-25 11:31:02 -0800 |
commit | 5404c116aa921d7e2f9408e103c80b7801735d08 (patch) | |
tree | 2a6e3a05b37e19e76242f0fdf54eba73879377f9 /t/t4014-format-patch.sh | |
parent | 9501d191adca307d6fbe3f2ab111fa20414dd893 (diff) | |
download | git-5404c116aa921d7e2f9408e103c80b7801735d08.tar.gz git-5404c116aa921d7e2f9408e103c80b7801735d08.tar.xz |
diff: activate diff.renames by default
Rename detection is a very convenient feature, and new users shouldn't
have to dig in the documentation to benefit from it.
Potential objections to activating rename detection are that it
sometimes fail, and it is sometimes slow. But rename detection is
already activated by default in several cases like "git status" and "git
merge", so activating diff.renames does not fundamentally change the
situation. When the rename detection fails, it now fails consistently
between "git diff" and "git status".
This setting does not affect plumbing commands, hence well-written
scripts will not be affected.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4014-format-patch.sh')
-rwxr-xr-x | t/t4014-format-patch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 3b99434e3..eed2981b9 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -549,7 +549,7 @@ test_expect_success 'cover-letter inherits diff options' ' git mv file foo && git commit -m foo && - git format-patch --cover-letter -1 && + git format-patch --no-renames --cover-letter -1 && check_patch 0000-cover-letter.patch && ! grep "file => foo .* 0 *\$" 0000-cover-letter.patch && git format-patch --cover-letter -1 -M && @@ -703,7 +703,7 @@ test_expect_success 'options no longer allowed for format-patch' ' test_expect_success 'format-patch --numstat should produce a patch' ' git format-patch --numstat --stdout master..side > output && - test 6 = $(grep "^diff --git a/" output | wc -l)' + test 5 = $(grep "^diff --git a/" output | wc -l)' test_expect_success 'format-patch -- <path>' ' git format-patch master..side -- file 2>error && |