diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-03-21 14:18:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-21 14:18:55 -0700 |
| commit | 15108de2fa0cd8f002a0551d14c84505a853071c (patch) | |
| tree | ffdbcfd36b7f18eba44b8733c4df582303433000 /t/t4014-format-patch.sh | |
| parent | e25cabbf6b34e4a6e903d65102d87055cc994778 (diff) | |
| parent | ab89575387c02ea024163256826ad1c6dd2e4247 (diff) | |
| download | git-15108de2fa0cd8f002a0551d14c84505a853071c.tar.xz | |
Merge branch 'jk/format-patch-ignore-noprefix'
"git format-patch" honors the src/dst prefixes set to nonstandard
values with configuration variables like "diff.noprefix", causing
receiving end of the patch that expects the standard -p1 format to
break. Teach "format-patch" to ignore end-user configuration and
always use the standard prefixes.
This is a backward compatibility breaking change.
* jk/format-patch-ignore-noprefix:
rebase: prefer --default-prefix to --{src,dst}-prefix for format-patch
format-patch: add format.noprefix option
format-patch: do not respect diff.noprefix
diff: add --default-prefix option
t4013: add tests for diff prefix options
diff: factor out src/dst prefix setup
Diffstat (limited to 't/t4014-format-patch.sh')
| -rwxr-xr-x | t/t4014-format-patch.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index ffc7c60680..8c3d06622a 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -2396,4 +2396,20 @@ test_expect_success 'interdiff: solo-patch' ' test_cmp expect actual ' +test_expect_success 'format-patch does not respect diff.noprefix' ' + git -c diff.noprefix format-patch -1 --stdout >actual && + grep "^--- a/blorp" actual +' + +test_expect_success 'format-patch respects format.noprefix' ' + git -c format.noprefix format-patch -1 --stdout >actual && + grep "^--- blorp" actual +' + +test_expect_success 'format-patch --default-prefix overrides format.noprefix' ' + git -c format.noprefix \ + format-patch -1 --default-prefix --stdout >actual && + grep "^--- a/blorp" actual +' + test_done |