Merge branch 'ks/difftool-dir-diff-copy-fix'

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index d7a19a182941c7ab54b81bb8013835cfb8c5919f..fde689166a5dcb419e0519580d628f91f1f29f83 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" &&