diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-17 18:03:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-17 18:03:40 (GMT) |
| commit | 0eefe108ec2a946e40072caf58c52e3b7f573e52 (patch) | |
| tree | ab813aa520e027cea3497cb199bc9acb4478c24a /t | |
| parent | 88221d92cbc21f629b60eb046e5aabd6cdc67cca (diff) | |
| parent | b2e93f88cb94f487650beb93ff87ceb7ab68a0ed (diff) | |
| download | git-0eefe108ec2a946e40072caf58c52e3b7f573e52.zip git-0eefe108ec2a946e40072caf58c52e3b7f573e52.tar.gz git-0eefe108ec2a946e40072caf58c52e3b7f573e52.tar.bz2 | |
Merge branch 'aw/push-force-with-lease-reporting' into maint
"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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5533-push-cas.sh | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh index c402d8d..c732012 100755 --- a/t/t5533-push-cas.sh +++ b/t/t5533-push-cas.sh @@ -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 && |