diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-03-12 21:44:48 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-03-12 21:44:48 -0700 |
commit | daf713dd497ef04855ccecf90ad9aafb17769681 (patch) | |
tree | 2bcd165232ae8bec4c859e05c6624c2c0a9bcb06 /t | |
parent | Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.1 (diff) | |
parent | revision traversal: allow UNINTERESTING objects to be missing (diff) | |
download | tgif-daf713dd497ef04855ccecf90ad9aafb17769681.tar.xz |
Merge branch 'jc/maint-1.6.1-allow-uninteresting-missing' into maint-1.6.1
* jc/maint-1.6.1-allow-uninteresting-missing:
revision traversal: allow UNINTERESTING objects to be missing
Diffstat (limited to 't')
-rwxr-xr-x | t/t5519-push-alternates.sh | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/t/t5519-push-alternates.sh b/t/t5519-push-alternates.sh index 6dfc55ad61..96be5236a2 100755 --- a/t/t5519-push-alternates.sh +++ b/t/t5519-push-alternates.sh @@ -103,4 +103,41 @@ test_expect_success 'bob works and pushes' ' ) ' +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 + ) +' + test_done |