blob: 2b8c0bac7db47ef7b37024ecea95ed0e37d5364f [file] [log] [blame]
Alex Riesen6fa92bf2007-11-12 22:38:23 +01001#!/bin/sh
2
3test_description='tracking branch update checks for git push'
4
5. ./test-lib.sh
6
7test_expect_success 'setup' '
8 echo 1 >file &&
9 git add file &&
10 git commit -m 1 &&
11 git branch b1 &&
12 git branch b2 &&
Jeff King0b294c02008-07-08 00:08:02 -040013 git branch b3 &&
Alex Riesen6fa92bf2007-11-12 22:38:23 +010014 git clone . aa &&
15 git checkout b1 &&
16 echo b1 >>file &&
17 git commit -a -m b1 &&
18 git checkout b2 &&
19 echo b2 >>file &&
20 git commit -a -m b2
21'
22
Jeff King8736a842007-11-17 07:54:27 -050023test_expect_success 'prepare pushable branches' '
Alex Riesen6fa92bf2007-11-12 22:38:23 +010024 cd aa &&
25 b1=$(git rev-parse origin/b1) &&
26 b2=$(git rev-parse origin/b2) &&
27 git checkout -b b1 origin/b1 &&
28 echo aa-b1 >>file &&
29 git commit -a -m aa-b1 &&
30 git checkout -b b2 origin/b2 &&
31 echo aa-b2 >>file &&
32 git commit -a -m aa-b2 &&
33 git checkout master &&
34 echo aa-master >>file &&
Jeff King8736a842007-11-17 07:54:27 -050035 git commit -a -m aa-master
36'
37
Stephan Beyerd492b312008-07-12 17:47:52 +020038test_expect_success 'mixed-success push returns error' '
Junio C Hamano2f9ae5f2013-01-04 16:04:22 -080039 test_must_fail git push origin :
Stephan Beyerd492b312008-07-12 17:47:52 +020040'
Jeff King8736a842007-11-17 07:54:27 -050041
42test_expect_success 'check tracking branches updated correctly after push' '
43 test "$(git rev-parse origin/master)" = "$(git rev-parse master)"
44'
45
46test_expect_success 'check tracking branches not updated for failed refs' '
Alex Riesen6fa92bf2007-11-12 22:38:23 +010047 test "$(git rev-parse origin/b1)" = "$b1" &&
48 test "$(git rev-parse origin/b2)" = "$b2"
49'
50
Jeff King1f0e2a12007-11-17 07:55:15 -050051test_expect_success 'deleted branches have their tracking branches removed' '
52 git push origin :b1 &&
53 test "$(git rev-parse origin/b1)" = "origin/b1"
54'
55
Jeff King0b294c02008-07-08 00:08:02 -040056test_expect_success 'already deleted tracking branches ignored' '
57 git branch -d -r origin/b3 &&
58 git push origin :b3 >output 2>&1 &&
59 ! grep error output
60'
61
Alex Riesen6fa92bf2007-11-12 22:38:23 +010062test_done