diff options
| author | Sergey Organov <sorganov@gmail.com> | 2021-05-20 23:46:58 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-21 02:24:14 +0200 |
| commit | e0b16421b17fffa2544eebfcb570fdb766fd0bc4 (patch) | |
| tree | cd0d3550f4d6ab73677ac8319b2ca5c1470a1338 /t/t4013-diff-various.sh | |
| parent | t4013: test "git diff-tree -m" (diff) | |
| download | git-e0b16421b17fffa2544eebfcb570fdb766fd0bc4.tar.xz git-e0b16421b17fffa2544eebfcb570fdb766fd0bc4.zip | |
t4013: test "git diff-index -m"
-m in "git diff-index" means "match missing", that differs
from its meaning in "git diff". Let's check it in diff-index.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013-diff-various.sh')
| -rwxr-xr-x | t/t4013-diff-various.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index bdc23b1180..e561a8e485 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -494,6 +494,19 @@ test_expect_success 'git config log.diffMerges first-parent vs -m' ' test_cmp expected actual ' +# -m in "git diff-index" means "match missing", that differs +# from its meaning in "git diff". Let's check it in diff-index. +# The line in the output for removed file should disappear when +# we provide -m in diff-index. +test_expect_success 'git diff-index -m' ' + rm -f file1 && + git diff-index HEAD >without-m && + lines_count=$(wc -l <without-m) && + git diff-index -m HEAD >with-m && + git restore file1 && + test_line_count = $((lines_count - 1)) with-m +' + test_expect_success 'log -S requires an argument' ' test_must_fail git log -S ' |