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

Merge branch 'aw/push-force-with-lease-reporting'

Browse Source 
"git push --force-with-lease" has been taught to report if the push
needed to force (or fast-forwarded).

* aw/push-force-with-lease-reporting:
  push: fix ref status reporting for --force-with-lease
This commit is contained in:
Junio C Hamano
2016-02-10 14:20:08 -08:00
parent a3764e7da7 b2e93f88cb
commit 24abb31727
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
t/t5533-push-cas.sh
View File

@ -25,7 +25,8 @@ test_expect_success 'push to update (protected)' '
(
cd dst &&
test_commit D &&
test_must_fail git push --force-with-lease=master:master origin master
test_must_fail git push --force-with-lease=master:master origin master 2>err &&
grep "stale info" err
) &&
git ls-remote . refs/heads/master >expect &&
git ls-remote src refs/heads/master >actual &&
@ -37,7 +38,8 @@ test_expect_success 'push to update (protected, forced)' '
(
cd dst &&
test_commit D &&
git push --force --force-with-lease=master:master origin master
git push --force --force-with-lease=master:master origin master 2>err &&
grep "forced update" err
) &&
git ls-remote dst refs/heads/master >expect &&
git ls-remote src refs/heads/master >actual &&
@ -101,7 +103,8 @@ test_expect_success 'push to update (allowed, tracking)' '
(
cd dst &&
test_commit D &&
git push --force-with-lease=master origin master
git push --force-with-lease=master origin master 2>err &&
! grep "forced update" err
) &&
git ls-remote dst refs/heads/master >expect &&
git ls-remote src refs/heads/master >actual &&
@ -114,7 +117,8 @@ test_expect_success 'push to update (allowed even though no-ff)' '
cd dst &&
git reset --hard HEAD^ &&
test_commit D &&
git push --force-with-lease=master origin master
git push --force-with-lease=master origin master 2>err &&
grep "forced update" err
) &&
git ls-remote dst refs/heads/master >expect &&
git ls-remote src refs/heads/master >actual &&
@ -147,7 +151,8 @@ test_expect_success 'push to delete (allowed)' '
setup_srcdst_basic &&
(
cd dst &&
git push --force-with-lease=master origin :master
git push --force-with-lease=master origin :master 2>err &&
grep deleted err
) &&
>expect &&
git ls-remote src refs/heads/master >actual &&