Browse Source
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
Alex Riesen
17 years ago
committed by
Junio C Hamano
1 changed files with 40 additions and 0 deletions
@ -0,0 +1,40 @@
@@ -0,0 +1,40 @@
|
||||
#!/bin/sh |
||||
|
||||
test_description='tracking branch update checks for git push' |
||||
|
||||
. ./test-lib.sh |
||||
|
||||
test_expect_success 'setup' ' |
||||
echo 1 >file && |
||||
git add file && |
||||
git commit -m 1 && |
||||
git branch b1 && |
||||
git branch b2 && |
||||
git clone . aa && |
||||
git checkout b1 && |
||||
echo b1 >>file && |
||||
git commit -a -m b1 && |
||||
git checkout b2 && |
||||
echo b2 >>file && |
||||
git commit -a -m b2 |
||||
' |
||||
|
||||
test_expect_success 'check tracking branches updated correctly after push' ' |
||||
cd aa && |
||||
b1=$(git rev-parse origin/b1) && |
||||
b2=$(git rev-parse origin/b2) && |
||||
git checkout -b b1 origin/b1 && |
||||
echo aa-b1 >>file && |
||||
git commit -a -m aa-b1 && |
||||
git checkout -b b2 origin/b2 && |
||||
echo aa-b2 >>file && |
||||
git commit -a -m aa-b2 && |
||||
git checkout master && |
||||
echo aa-master >>file && |
||||
git commit -a -m aa-master && |
||||
git push && |
||||
test "$(git rev-parse origin/b1)" = "$b1" && |
||||
test "$(git rev-parse origin/b2)" = "$b2" |
||||
' |
||||
|
||||
test_done |
Loading…
Reference in new issue