Merge branch 'bc/object-id'

diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh
index 77e1c130c2de85d18fadc114e82c7d169e075ab6..e8115df5bad8d9ef46542cfd3c96c32da0bfa4ad 100755 (executable)
--- a/t/t1405-main-ref-store.sh
+++ b/t/t1405-main-ref-store.sh
@@ -31,7 +31,7 @@ test_expect_success 'create_symref(FOO, refs/heads/master)' '
 test_expect_success 'delete_refs(FOO, refs/tags/new-tag)' '
        git rev-parse FOO -- &&
        git rev-parse refs/tags/new-tag -- &&
-       $RUN delete-refs 0 FOO refs/tags/new-tag &&
+       $RUN delete-refs 0 nothing FOO refs/tags/new-tag &&
        test_must_fail git rev-parse FOO -- &&
        test_must_fail git rev-parse refs/tags/new-tag --
 '
@@ -53,6 +53,12 @@ test_expect_success 'for_each_ref(refs/heads/)' '
        test_cmp expected actual
 '
 
+test_expect_success 'for_each_ref() is sorted' '
+       $RUN for-each-ref refs/heads/ | cut -c 42- >actual &&
+       sort actual > expected &&
+       test_cmp expected actual
+'
+
 test_expect_success 'resolve_ref(new-master)' '
        SHA1=`git rev-parse new-master` &&
        echo "$SHA1 refs/heads/new-master 0x0" >expected &&