Browse Source

t2203: add a test about "diff HEAD" case

Previous attempts to fix ita-related diffs breaks this case. To make
sure that does not happen again, add a test to verify the behavior
wrt. ita entries when we diff a worktree and a tree.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 7 years ago committed by Junio C Hamano
parent
commit
8fc8f05cef
  1. 17
      t/t2203-add-intent.sh

17
t/t2203-add-intent.sh

@ -245,4 +245,21 @@ test_expect_success 'diff-files/diff-cached shows ita as new/not-new files' ' @@ -245,4 +245,21 @@ test_expect_success 'diff-files/diff-cached shows ita as new/not-new files' '
test_cmp expected2 actual2
'

test_expect_success '"diff HEAD" includes ita as new files' '
git reset --hard &&
echo new >new-ita &&
git add -N new-ita &&
git diff HEAD >actual &&
cat >expected <<-\EOF &&
diff --git a/new-ita b/new-ita
new file mode 100644
index 0000000..3e75765
--- /dev/null
+++ b/new-ita
@@ -0,0 +1 @@
+new
EOF
test_cmp expected actual
'

test_done

Loading…
Cancel
Save