summaryrefslogtreecommitdiff
path: root/t/t4000-diff-format.sh
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2013-07-16 08:05:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-18 00:50:56 (GMT)
commitd09cd15d19de23aca532a85f6d27a71b2baceb3f (patch)
tree83ba6d8aa00c4b0d7ae10500fa04cfaf1ee4d155 /t/t4000-diff-format.sh
parent8ade9b140f099540bcdec5bcf660faaf05b5e3ee (diff)
downloadgit-d09cd15d19de23aca532a85f6d27a71b2baceb3f.zip
git-d09cd15d19de23aca532a85f6d27a71b2baceb3f.tar.gz
git-d09cd15d19de23aca532a85f6d27a71b2baceb3f.tar.bz2
diff: allow --no-patch as synonym for -s
This follows the usual convention of having a --no-foo option to negate --foo. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4000-diff-format.sh')
-rwxr-xr-xt/t4000-diff-format.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh
index 2b5dffc..3b9a9ae 100755
--- a/t/t4000-diff-format.sh
+++ b/t/t4000-diff-format.sh
@@ -59,4 +59,16 @@ test_expect_success 'validate git diff-files -p output.' '
compare_diff_patch expected actual
'
+test_expect_success 'git diff-files -s after editing work tree' '
+ git diff-files -s >actual 2>err &&
+ test_must_be_empty actual &&
+ test_must_be_empty err
+'
+
+test_expect_success 'git diff-files --no-patch as synonym for -s' '
+ git diff-files --no-patch >actual 2>err &&
+ test_must_be_empty actual &&
+ test_must_be_empty err
+'
+
test_done