mirror of
https://github.com/git/git.git
synced 2024-12-18 14:24:11 +08:00
1f0e2a1a65
Previously, we manually checked the 'NONE' and 'UPTODATE'
conditions. Now that we have ref->status, we can easily
say "only update if we pushed successfully".
This adds a test for and fixes a regression introduced in
ed31df31 where deleted refs did not have their tracking
branches removed. This was due to a bogus per-ref error test
that is superseded by the more accurate ref->status flag.
Signed-off-by: Jeff King <peff@peff.net>
Completely-Acked-By: Alex "Sleepy" Riesen <raa.lkml@gmail.com>
Acked-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
54 lines
1.2 KiB
Bash
Executable File
54 lines
1.2 KiB
Bash
Executable File
#!/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 'prepare pushable branches' '
|
|
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
|
|
'
|
|
|
|
test_expect_success 'mixed-success push returns error' '! git push'
|
|
|
|
test_expect_success 'check tracking branches updated correctly after push' '
|
|
test "$(git rev-parse origin/master)" = "$(git rev-parse master)"
|
|
'
|
|
|
|
test_expect_success 'check tracking branches not updated for failed refs' '
|
|
test "$(git rev-parse origin/b1)" = "$b1" &&
|
|
test "$(git rev-parse origin/b2)" = "$b2"
|
|
'
|
|
|
|
test_expect_success 'deleted branches have their tracking branches removed' '
|
|
git push origin :b1 &&
|
|
test "$(git rev-parse origin/b1)" = "origin/b1"
|
|
'
|
|
|
|
test_done
|