diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-03 17:29:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-03 17:29:22 (GMT) |
| commit | 5d2a30d7d8777319c745804f040fa405d02169ce (patch) | |
| tree | 75a490997367dd1b4ea1f8e52db9260a6b6dda2b /t/t4014-format-patch.sh | |
| parent | f66a5bd9236b19288ad39387ec519a11d65b513d (diff) | |
| parent | 5404c116aa921d7e2f9408e103c80b7801735d08 (diff) | |
| download | git-5d2a30d7d8777319c745804f040fa405d02169ce.zip git-5d2a30d7d8777319c745804f040fa405d02169ce.tar.gz git-5d2a30d7d8777319c745804f040fa405d02169ce.tar.bz2 | |
Merge branch 'mm/diff-renames-default'
The end-user facing Porcelain level commands like "diff" and "log"
now enables the rename detection by default.
* mm/diff-renames-default:
diff: activate diff.renames by default
log: introduce init_log_defaults()
t: add tests for diff.renames (true/false/unset)
t4001-diff-rename: wrap file creations in a test
Documentation/diff-config: fix description of diff.renames
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 3b99434..eed2981 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 && |