Skip to content

Commit df52146

Browse files
phillipwoodgitster
authored andcommitted
t4054: test diff --no-index with stdin
"git diff --no-index" supports reading from stdin with the path "-". There is no test coverage for this so add a regression test before changing the code in the next commit. Signed-off-by: Phillip Wood <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4e61e0f commit df52146

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

t/t4053-diff-no-index.sh

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,25 @@ test_expect_success POSIXPERM,SYMLINKS 'diff --no-index normalizes: mode not lik
205205
test_cmp expected actual
206206
'
207207

208+
test_expect_success "diff --no-index treats '-' as stdin" '
209+
cat >expect <<-EOF &&
210+
diff --git a/- b/a/1
211+
index $ZERO_OID..$(git hash-object --stdin <a/1) 100644
212+
--- a/-
213+
+++ b/a/1
214+
@@ -1 +1 @@
215+
-x
216+
+1
217+
EOF
218+
219+
test_write_lines x | test_expect_code 1 \
220+
git -c core.abbrev=no diff --no-index -- - a/1 >actual &&
221+
test_cmp expect actual &&
222+
223+
test_write_lines 1 | git diff --no-index -- a/1 - >actual &&
224+
test_must_be_empty actual
225+
'
226+
208227
test_expect_success 'diff --no-index refuses to diff stdin and a directory' '
209228
test_must_fail git diff --no-index -- - a </dev/null 2>err &&
210229
grep "fatal: cannot compare stdin to a directory" err

0 commit comments

Comments
 (0)