diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-15 23:07:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 23:07:49 -0800 |
| commit | 1f9d282bd17ef6ccb791abeb34d36de503da9558 (patch) | |
| tree | 36de085de0ab6c192e7bfc5a963d369783e55fb4 /t | |
| parent | 3ad12436a0d21f3379d936027caeca6ac73f24fa (diff) | |
| parent | 1d46f2ea143534e46e6bfee3f34cd90b734bfe80 (diff) | |
| download | git-1f9d282bd17ef6ccb791abeb34d36de503da9558.tar.gz git-1f9d282bd17ef6ccb791abeb34d36de503da9558.tar.xz | |
Merge branch 'jk/maint-format-patch-p-suppress-stat' into maint
* jk/maint-format-patch-p-suppress-stat:
format-patch: make "-p" suppress diffstat
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4014-format-patch.sh | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 531f5b795..cab6ce2e9 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -455,6 +455,27 @@ test_expect_success 'format-patch respects -U' ' ' +cat > expect << EOF + +diff --git a/file b/file +index 40f36c6..2dc5c23 100644 +--- a/file ++++ b/file +@@ -14,3 +14,19 @@ C + D + E + F ++5 +EOF + +test_expect_success 'format-patch -p suppresses stat' ' + + git format-patch -p -2 && + sed -e "1,/^$/d" -e "/^+5/q" < 0001-This-is-an-excessively-long-subject-line-for-a-messa.patch > output && + test_cmp expect output + +' + test_expect_success 'format-patch from a subdirectory (1)' ' filename=$( rm -rf sub && |