Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1

[git.git] / t / t5510-fetch.sh

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index df7750f7d1ede6e888ec3071397115022e067eb3..9e679b402dc826185377c431d353decd8a8a2bed 100755 (executable)
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -104,20 +104,20 @@ test_expect_success 'fetch must not resolve short tag name' '
        cd five &&
        git init &&
 
-       ! git fetch .. anno:five
+       test_must_fail git fetch .. anno:five
 
 '
 
 test_expect_success 'fetch must not resolve short remote name' '
 
        cd "$D" &&
-       git-update-ref refs/remotes/six/HEAD HEAD
+       git update-ref refs/remotes/six/HEAD HEAD
 
        mkdir six &&
        cd six &&
        git init &&
 
-       ! git fetch .. six:six
+       test_must_fail git fetch .. six:six
 
 '
 
@@ -143,7 +143,7 @@ test_expect_success 'create bundle 2' '
 test_expect_success 'unbundle 1' '
        cd "$D/bundle" &&
        git checkout -b some-branch &&
-       ! git fetch "$D/bundle1" master:master
+       test_must_fail git fetch "$D/bundle1" master:master
 '
 
 test_expect_success 'bundle 1 has only 3 files ' '
@@ -236,7 +236,7 @@ test_expect_success 'fetch with a non-applying branch.<name>.merge' '
 
 # the strange name is: a\!'b
 test_expect_success 'quoting of a strangely named repo' '
-       ! git fetch "a\\!'\''b" > result 2>&1 &&
+       test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
        cat result &&
        grep "fatal: '\''a\\\\!'\''b'\''" result
 '
@@ -264,7 +264,7 @@ test_expect_success 'explicit fetch should not update tracking' '
                git fetch origin master &&
                n=$(git rev-parse --verify refs/remotes/origin/master) &&
                test "$o" = "$n" &&
-               ! git rev-parse --verify refs/remotes/origin/side
+               test_must_fail git rev-parse --verify refs/remotes/origin/side
        )
 '
 
@@ -278,7 +278,7 @@ test_expect_success 'explicit pull should not update tracking' '
                git pull origin master &&
                n=$(git rev-parse --verify refs/remotes/origin/master) &&
                test "$o" = "$n" &&
-               ! git rev-parse --verify refs/remotes/origin/side
+               test_must_fail git rev-parse --verify refs/remotes/origin/side
        )
 '
 
@@ -303,4 +303,36 @@ test_expect_success 'pushing nonexistent branch by mistake should not segv' '
 
 '
 
+test_expect_success 'auto tag following fetches minimum' '
+
+       cd "$D" &&
+       git clone .git follow &&
+       git checkout HEAD^0 &&
+       (
+               for i in 1 2 3 4 5 6 7
+               do
+                       echo $i >>file &&
+                       git commit -m $i -a &&
+                       git tag -a -m $i excess-$i || exit 1
+               done
+       ) &&
+       git checkout master &&
+       (
+               cd follow &&
+               git fetch
+       )
+'
+
+test_expect_success 'refuse to fetch into the current branch' '
+
+       test_must_fail git fetch . side:master
+
+'
+
+test_expect_success 'fetch into the current branch with --update-head-ok' '
+
+       git fetch --update-head-ok . side:master
+
+'
+
 test_done