Merge branch 'dm/add-i-edit-abort'

diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index d3a17b45081c099547c63d4b9be7a6dd47f07deb..4597af0eb6c5c0508dd40306ce2790fc4f6afb0c 100755 (executable)
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -16,4 +16,16 @@ test_expect_success 'HEAD is part of refs' '
        test 0 = $(git fsck | wc -l)
 '
 
+test_expect_success 'loose objects borrowed from alternate are not missing' '
+       mkdir another &&
+       (
+               cd another &&
+               git init &&
+               echo ../../../.git/objects >.git/objects/info/alternates &&
+               test_commit C fileC one &&
+               git fsck >out &&
+               ! grep "missing blob" out
+       )
+'
+
 test_done