summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-03-29 21:29:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-29 21:29:24 -0700
commit87b3c0117a340df61bdbac6794611c74696bd42a (patch)
tree94eee7da8ecfda6a4c42ac6ef0902814903f09f6 /t
parentUpdate draft release notes to 1.7.1 (diff)
parentformat-patch: Squelch 'fatal: Not a range." error (diff)
downloadtgif-87b3c0117a340df61bdbac6794611c74696bd42a.tar.xz
Merge branch 'maint'
* maint: format-patch: Squelch 'fatal: Not a range." error
Diffstat (limited to 't')
-rwxr-xr-xt/t4014-format-patch.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index c7b625642d..d21c37f3a2 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -609,4 +609,8 @@ test_expect_success 'format-patch -- <path>' '
! grep "Use .--" error
'
+test_expect_success 'format-patch --ignore-if-in-upstream HEAD' '
+ git format-patch --ignore-if-in-upstream HEAD
+'
+
test_done