read_raw_ref(): rename flags argument to type

diff --git a/t/t5519-push-alternates.sh b/t/t5519-push-alternates.sh
index 6dfc55ad61246e1520a4909e02603b5328fee2a2..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,44 @@ 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 :
+       )
+'
+
+test_expect_success 'alice works and pushes yet again' '
+       (
+               # Alice does not care what Bob does.  She does not
+               # even have to be aware of his existence.  She just
+               # keeps working and pushing
+               cd alice-work &&
+               echo more and more alice >file &&
+               git commit -a -m sixth.1 &&
+               echo more and more alice >>file &&
+               git commit -a -m sixth.2 &&
+               echo more and more alice >>file &&
+               git commit -a -m sixth.3 &&
+               git push ../alice-pub :
+       )
+'
+
+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
+               # at a commit Bob does not fully know about, but
+               # he happens to have the commit object (but not the
+               # necessary tree) in his repository from Alice.
+               # This should not prevent the push by Bob from
+               # succeeding.
+               cd bob-work &&
+               git hash-object -t commit -w commit &&
+               echo even more bob >file &&
+               git commit -a -m seventh &&
+               git push ../bob-pub :
        )
 '