diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-29 11:52:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-29 11:52:33 -0700 |
| commit | 6adc876016942161146e0cb782d55f28d77cc3f0 (patch) | |
| tree | 44bd5a5a609579693e06f7881564f4d5a7f6d587 /t/t4013-diff-various.sh | |
| parent | 9e76bab14e50c46c624ae35f13c527a7a1b1185d (diff) | |
| parent | d410e43b35a8044472606a7e7018aa64d96a5f0f (diff) | |
| download | git-6adc876016942161146e0cb782d55f28d77cc3f0.tar.gz | |
Merge branch 'jc/diff-test' into jc/diff-test-updates
* jc/diff-test:
t4013: add format-patch tests.
Diffstat (limited to 't/t4013-diff-various.sh')
| -rwxr-xr-x | t/t4013-diff-various.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 22984e3db7..f4f3c3a56d 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -85,6 +85,7 @@ test_expect_success setup ' +*+ [initial] Initial EOF +V=`git version | sed -e 's/^git version //'` while read cmd do case "$cmd" in @@ -99,7 +100,7 @@ do test_expect_success "git $cmd" ' { echo "\$ git $cmd" - git $cmd + git $cmd | sed -e "s/$V/g-i-t--v-e-r-s-i-o-n/" echo "\$" } >"$actual" && if test -f "$expect" @@ -219,6 +220,13 @@ show --patch-with-stat side show --patch-with-raw side show --patch-with-stat --summary side +format-patch --stdout initial..side +format-patch --stdout initial..master^ +format-patch --stdout initial..master +format-patch --attach --stdout initial..side +format-patch --attach --stdout initial..master^ +format-patch --attach --stdout initial..master + EOF test_done |