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

diff --git a/t/t5519-push-alternates.sh b/t/t5519-push-alternates.sh
index 96be5236a2faf7178edc3c60094ecc37da741a65..11fcd37700f372117145258f209e6c56ae04a1fc 100755 (executable)
--- a/t/t5519-push-alternates.sh
+++ b/t/t5519-push-alternates.sh
@@ -40,7 +40,7 @@ test_expect_success 'alice works and pushes' '
                cd alice-work &&
                echo more >file &&
                git commit -a -m second &&
-               git push ../alice-pub
+               git push ../alice-pub :
        )
 '
 
@@ -57,7 +57,7 @@ test_expect_success 'bob fetches from alice, works and pushes' '
                git pull ../alice-pub master &&
                echo more bob >file &&
                git commit -a -m third &&
-               git push ../bob-pub
+               git push ../bob-pub :
        ) &&
 
        # Check that the second commit by Alice is not sent
@@ -86,7 +86,7 @@ test_expect_success 'alice works and pushes again' '
                cd alice-work &&
                echo more alice >file &&
                git commit -a -m fourth &&
-               git push ../alice-pub
+               git push ../alice-pub :
        )
 '
 
@@ -99,7 +99,7 @@ test_expect_success 'bob works and pushes' '
                cd bob-work &&
                echo yet more bob >file &&
                git commit -a -m fifth &&
-               git push ../bob-pub
+               git push ../bob-pub :
        )
 '
 
@@ -115,7 +115,7 @@ test_expect_success 'alice works and pushes yet again' '
                git commit -a -m sixth.2 &&
                echo more and more alice >>file &&
                git commit -a -m sixth.3 &&
-               git push ../alice-pub
+               git push ../alice-pub :
        )
 '
 
@@ -123,7 +123,7 @@ test_expect_success 'bob works and pushes again' '
        (
                cd alice-pub &&
                git cat-file commit master >../bob-work/commit
-       )
+       ) &&
        (
                # This time Bob does not pull from Alice, and
                # the master branch at her public repository points
@@ -136,7 +136,7 @@ test_expect_success 'bob works and pushes again' '
                git hash-object -t commit -w commit &&
                echo even more bob >file &&
                git commit -a -m seventh &&
-               git push ../bob-pub
+               git push ../bob-pub :
        )
 '