apply: register conflicted stages to the index

diff --git a/t/t1050-large.sh b/t/t1050-large.sh
index ded66b3228920220c710788337874f46401e83a1..4d127f19b78cc76018e316532c905137e9c7ab08 100755 (executable)
--- a/t/t1050-large.sh
+++ b/t/t1050-large.sh
@@ -116,21 +116,21 @@ test_expect_success 'hash-object' '
        git hash-object large1
 '
 
-test_expect_failure 'cat-file a large file' '
+test_expect_success 'cat-file a large file' '
        git cat-file blob :large1 >/dev/null
 '
 
-test_expect_failure 'cat-file a large file from a tag' '
+test_expect_success 'cat-file a large file from a tag' '
        git tag -m largefile largefiletag :large1 &&
        git cat-file blob largefiletag >/dev/null
 '
 
-test_expect_failure 'git-show a large file' '
+test_expect_success 'git-show a large file' '
        git show :large1 >/dev/null
 
 '
 
-test_expect_failure 'repack' '
+test_expect_success 'repack' '
        git repack -ad
 '