Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 61a02a91a198d9150cec0692c57c1b5d1a576cf5..b2e6e96b3f928c5ca66589e4e24f28eeeaf176c5 100755 (executable)
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -308,6 +308,26 @@ 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