summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f192c5d)
raw | patch | inline | side by side (parent: f192c5d)
author | Alex Riesen <raa.lkml@gmail.com> | |
Mon, 12 Nov 2007 21:38:23 +0000 (22:38 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 13 Nov 2007 01:50:31 +0000 (17:50 -0800) |
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t5404-tracking-branches.sh | [new file with mode: 0755] | patch | blob |
diff --git a/t/t5404-tracking-branches.sh b/t/t5404-tracking-branches.sh
--- /dev/null
@@ -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