mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/send-pack' into HEAD

Browse Source 
* jk/send-pack:
  t5516: test update of local refs on push
  send-pack: don't update tracking refs on error
This commit is contained in:
Junio C Hamano
2007-10-30 21:38:04 -07:00
parent 7e9a4645d1 09fba7a59d
commit 7ae4dd0572
2 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
t/t5516-fetch-push.sh
View File

@ -254,4 +254,32 @@ test_expect_success 'push with dry-run' '
check_push_result $old_commit heads/master
'
test_expect_success 'push updates local refs' '
rm -rf parent child &&
mkdir parent && cd parent && git init &&
echo one >foo && git add foo && git commit -m one &&
cd .. &&
git clone parent child && cd child &&
echo two >foo && git commit -a -m two &&
git push &&
test $(git rev-parse master) = $(git rev-parse remotes/origin/master)
'
test_expect_success 'push does not update local refs on failure' '
rm -rf parent child &&
mkdir parent && cd parent && git init &&
echo one >foo && git add foo && git commit -m one &&
echo exit 1 >.git/hooks/pre-receive &&
chmod +x .git/hooks/pre-receive &&
cd .. &&
git clone parent child && cd child &&
echo two >foo && git commit -a -m two || exit 1
git push && exit 1
test $(git rev-parse master) != $(git rev-parse remotes/origin/master)
'
test_done