diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-10 23:38:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-10 23:38:18 -0800 |
| commit | 8a3fbdd9e6c37c74b12fd0e8bd7cde8372861288 (patch) | |
| tree | b5c2cd69063409beb852841792fbf0ed41d12278 /t/t4013-diff-various.sh | |
| parent | cf6981d4932007555689052cbc255b911674b01c (diff) | |
| parent | 33ee4cfb6929c77307887bc2124eaeaf011892dc (diff) | |
| download | git-8a3fbdd9e6c37c74b12fd0e8bd7cde8372861288.tar.gz | |
Merge branch 'js/attach'
* js/attach:
format-patch --attach: not folding some long headers.
format-patch: add --inline option and make --attach a true attachment
Diffstat (limited to 't/t4013-diff-various.sh')
| -rwxr-xr-x | t/t4013-diff-various.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 9f54af5a1b..488e075c16 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -106,7 +106,7 @@ do echo "\$ git $cmd" git $cmd | sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \ - -e "s/^\\( *boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/" + -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/" echo "\$" } >"$actual" && if test -f "$expect" @@ -238,6 +238,9 @@ format-patch --stdout initial..master format-patch --attach --stdout initial..side format-patch --attach --stdout initial..master^ format-patch --attach --stdout initial..master +format-patch --inline --stdout initial..side +format-patch --inline --stdout initial..master^ +format-patch --inline --stdout initial..master diff --abbrev initial..side diff -r initial..side |