diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-10-11 14:24:47 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-11 14:24:48 +0900 |
| commit | 159cdabd87ac61081eeb22002780eb28689e19b3 (patch) | |
| tree | 17b370b2b5013f719f92eb3c915ea83b4b3598ae /t | |
| parent | Merge branch 'cb/pcre1-cleanup' (diff) | |
| parent | range-diff: internally force `diff.noprefix=true` (diff) | |
| download | tgif-159cdabd87ac61081eeb22002780eb28689e19b3.tar.xz | |
Merge branch 'js/range-diff-noprefix'
"git range-diff" segfaulted when diff.noprefix configuration was
used, as it blindly expected the patch it internally generates to
have the standard a/ and b/ prefixes. The command now forces the
internal patch to be built without any prefix, not to be affected
by any end-user configuration.
* js/range-diff-noprefix:
range-diff: internally force `diff.noprefix=true`
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3206-range-diff.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh index 0120f769f1..64b66f2094 100755 --- a/t/t3206-range-diff.sh +++ b/t/t3206-range-diff.sh @@ -461,4 +461,8 @@ test_expect_success 'format-patch --range-diff as commentary' ' grep "> 1: .* new message" 0001-* ' +test_expect_success 'range-diff overrides diff.noprefix internally' ' + git -c diff.noprefix=true range-diff HEAD^... +' + test_done |