Merge branch 'jk/fast-export-anonym-alt'

[thirdparty/git.git] / t / t5607-clone-bundle.sh

diff --git a/t/t5607-clone-bundle.sh b/t/t5607-clone-bundle.sh
index 2a0fb15cf175251df0a140aa4f5c56fd7885292d..6d5a977fcba60f70d2a7329eba4c70e7ac66e925 100755 (executable)
--- a/t/t5607-clone-bundle.sh
+++ b/t/t5607-clone-bundle.sh
@@ -16,7 +16,7 @@ test_expect_success 'setup' '
 
 test_expect_success '"verify" needs a worktree' '
        git bundle create tip.bundle -1 master &&
-       test_must_fail nongit git bundle verify ../tip.bundle 2>err &&
+       nongit test_must_fail git bundle verify ../tip.bundle 2>err &&
        test_i18ngrep "need a repository" err
 '
 
@@ -64,7 +64,7 @@ test_expect_success 'ridiculously long subject in boundary' '
        test -s heads &&
        git fetch long-subject-bundle.bdl &&
        sed -n "/^-/{p;q;}" long-subject-bundle.bdl >boundary &&
-       grep "^-[0-9a-f]\\{40\\} " boundary
+       grep "^-$OID_REGEX " boundary
 '
 
 test_expect_success 'prerequisites with an empty commit message' '
@@ -83,4 +83,15 @@ test_expect_success 'failed bundle creation does not leave cruft' '
        test_path_is_missing fail.bundle.lock
 '
 
+test_expect_success 'fetch SHA-1 from bundle' '
+       test_create_repo foo &&
+       test_commit -C foo x &&
+       git -C foo bundle create tip.bundle -1 master &&
+       git -C foo rev-parse HEAD >hash &&
+
+       # Exercise to ensure that fetching a SHA-1 from a bundle works with no
+       # errors
+       git fetch --no-tags foo/tip.bundle "$(cat hash)"
+'
+
 test_done