diff options
author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2013-07-16 10:05:36 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-07-17 17:50:56 -0700 |
commit | d09cd15d19de23aca532a85f6d27a71b2baceb3f (patch) | |
tree | 83ba6d8aa00c4b0d7ae10500fa04cfaf1ee4d155 /t | |
parent | t4000-diff-format.sh: modernize style (diff) | |
download | tgif-d09cd15d19de23aca532a85f6d27a71b2baceb3f.tar.xz |
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')
-rwxr-xr-x | t/t4000-diff-format.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh index 2b5dffc3c4..3b9a9ae682 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 |