t4008: modernise style

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index d7a19a182941c7ab54b81bb8013835cfb8c5919f..07986d94bdf2cebfc39ee25c990485f43cbf2999 100755 (executable)
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -370,30 +370,39 @@ test_expect_success 'bundle should record HEAD correctly' '
 
 '
 
-test_expect_success 'explicit fetch should not update tracking' '
+test_expect_success 'mark initial state of origin/master' '
+       (
+               cd three &&
+               git tag base-origin-master refs/remotes/origin/master
+       )
+'
+
+test_expect_success 'explicit fetch should update tracking' '
 
        cd "$D" &&
        git branch -f side &&
        (
                cd three &&
+               git update-ref refs/remotes/origin/master base-origin-master &&
                o=$(git rev-parse --verify refs/remotes/origin/master) &&
                git fetch origin master &&
                n=$(git rev-parse --verify refs/remotes/origin/master) &&
-               test "$o" = "$n" &&
+               test "$o" != "$n" &&
                test_must_fail git rev-parse --verify refs/remotes/origin/side
        )
 '
 
-test_expect_success 'explicit pull should not update tracking' '
+test_expect_success 'explicit pull should update tracking' '
 
        cd "$D" &&
        git branch -f side &&
        (
                cd three &&
+               git update-ref refs/remotes/origin/master base-origin-master &&
                o=$(git rev-parse --verify refs/remotes/origin/master) &&
                git pull origin master &&
                n=$(git rev-parse --verify refs/remotes/origin/master) &&
-               test "$o" = "$n" &&
+               test "$o" != "$n" &&
                test_must_fail git rev-parse --verify refs/remotes/origin/side
        )
 '
@@ -404,6 +413,7 @@ test_expect_success 'configured fetch updates tracking' '
        git branch -f side &&
        (
                cd three &&
+               git update-ref refs/remotes/origin/master base-origin-master &&
                o=$(git rev-parse --verify refs/remotes/origin/master) &&
                git fetch origin &&
                n=$(git rev-parse --verify refs/remotes/origin/master) &&
@@ -412,6 +422,22 @@ test_expect_success 'configured fetch updates tracking' '
        )
 '
 
+test_expect_success 'non-matching refspecs do not confuse tracking update' '
+       cd "$D" &&
+       git update-ref refs/odd/location HEAD &&
+       (
+               cd three &&
+               git update-ref refs/remotes/origin/master base-origin-master &&
+               git config --add remote.origin.fetch \
+                       refs/odd/location:refs/remotes/origin/odd &&
+               o=$(git rev-parse --verify refs/remotes/origin/master) &&
+               git fetch origin master &&
+               n=$(git rev-parse --verify refs/remotes/origin/master) &&
+               test "$o" != "$n" &&
+               test_must_fail git rev-parse --verify refs/remotes/origin/odd
+       )
+'
+
 test_expect_success 'pushing nonexistent branch by mistake should not segv' '
 
        cd "$D" &&
@@ -471,6 +497,88 @@ test_expect_success "should be able to fetch with duplicate refspecs" '
        )
 '
 
+# configured prune tests
+
+set_config_tristate () {
+       # var=$1 val=$2
+       case "$2" in
+       unset)  test_unconfig "$1" ;;
+       *)      git config "$1" "$2" ;;
+       esac
+}
+
+test_configured_prune () {
+       fetch_prune=$1 remote_origin_prune=$2 cmdline=$3 expected=$4
+
+       test_expect_success "prune fetch.prune=$1 remote.origin.prune=$2${3:+ $3}; $4" '
+               # make sure a newbranch is there in . and also in one
+               git branch -f newbranch &&
+               (
+                       cd one &&
+                       test_unconfig fetch.prune &&
+                       test_unconfig remote.origin.prune &&
+                       git fetch &&
+                       git rev-parse --verify refs/remotes/origin/newbranch
+               )
+
+               # now remove it
+               git branch -d newbranch &&
+
+               # then test
+               (
+                       cd one &&
+                       set_config_tristate fetch.prune $fetch_prune &&
+                       set_config_tristate remote.origin.prune $remote_origin_prune &&
+
+                       git fetch $cmdline &&
+                       case "$expected" in
+                       pruned)
+                               test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+                               ;;
+                       kept)
+                               git rev-parse --verify refs/remotes/origin/newbranch
+                               ;;
+                       esac
+               )
+       '
+}
+
+test_configured_prune unset unset ""           kept
+test_configured_prune unset unset "--no-prune" kept
+test_configured_prune unset unset "--prune"    pruned
+
+test_configured_prune false unset ""           kept
+test_configured_prune false unset "--no-prune" kept
+test_configured_prune false unset "--prune"    pruned
+
+test_configured_prune true  unset ""           pruned
+test_configured_prune true  unset "--prune"    pruned
+test_configured_prune true  unset "--no-prune" kept
+
+test_configured_prune unset false ""           kept
+test_configured_prune unset false "--no-prune" kept
+test_configured_prune unset false "--prune"    pruned
+
+test_configured_prune false false ""           kept
+test_configured_prune false false "--no-prune" kept
+test_configured_prune false false "--prune"    pruned
+
+test_configured_prune true  false ""           kept
+test_configured_prune true  false "--prune"    pruned
+test_configured_prune true  false "--no-prune" kept
+
+test_configured_prune unset true  ""           pruned
+test_configured_prune unset true  "--no-prune" kept
+test_configured_prune unset true  "--prune"    pruned
+
+test_configured_prune false true  ""           pruned
+test_configured_prune false true  "--no-prune" kept
+test_configured_prune false true  "--prune"    pruned
+
+test_configured_prune true  true  ""           pruned
+test_configured_prune true  true  "--prune"    pruned
+test_configured_prune true  true  "--no-prune" kept
+
 test_expect_success 'all boundary commits are excluded' '
        test_commit base &&
        test_commit oneside &&
@@ -486,4 +594,15 @@ test_expect_success 'all boundary commits are excluded' '
        test_bundle_object_count .git/objects/pack/pack-${pack##pack    }.pack 3
 '
 
+test_expect_success 'fetching a one-level ref works' '
+       test_commit extra &&
+       git reset --hard HEAD^ &&
+       git update-ref refs/foo extra &&
+       git init one-level &&
+       (
+               cd one-level &&
+               git fetch .. HEAD refs/foo
+       )
+'
+
 test_done