t1005: add test for "read-tree --reset -u A B"
With a conflicted index, this used to give us an error. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Nov 1, 2013 at 15:04 UTC
77b43cac9feac1079f3643988cfadee63e4365f7
1 file changed
+15
t/t1005-read-tree-reset.sh
+15
@@ -43,6 +43,21 @@ test_expect_success 'reset should remove remnants from a failed merge' '
43
! test -f old
44
'
45
46
+test_expect_success 'two-way reset should remove remnants too' '
47
+ read_tree_u_must_succeed --reset -u HEAD &&
48
+ git ls-files -s >expect &&
49
+ sha1=$(git rev-parse :new) &&
50
+ (
51
+ echo "100644 $sha1 1 old"
52
+ echo "100644 $sha1 3 old"
53
+ ) | git update-index --index-info &&
54
+ >old &&
55
+ git ls-files -s &&
56
+ read_tree_u_must_succeed --reset -u HEAD HEAD &&
57
+ git ls-files -s >actual &&
58
+ ! test -f old
59
+'
60
+
61
test_expect_success 'Porcelain reset should remove remnants too' '
62
read_tree_u_must_succeed --reset -u HEAD &&
63
git ls-files -s >expect &&