git-commit-vandalism/t/t5533-push-cas.sh
John Keeping 64ac39af70 push: allow pushing new branches with --force-with-lease
If there is no upstream information for a branch, it is likely that it
is newly created and can safely be pushed under the normal fast-forward
rules.  Relax the --force-with-lease check so that we do not reject
these branches immediately but rather attempt to push them as new
branches, using the null SHA-1 as the expected value.

In fact, it is already possible to push new branches using the explicit
--force-with-lease=<branch>:<expect> syntax, so all we do here is make
this behaviour the default if no explicit "expect" value is specified.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-07-26 13:48:28 -07:00

233 lines
5.4 KiB
Bash
Executable File

#!/bin/sh
test_description='compare & swap push force/delete safety'
. ./test-lib.sh
setup_srcdst_basic () {
rm -fr src dst &&
git clone --no-local . src &&
git clone --no-local src dst &&
(
cd src && git checkout HEAD^0
)
}
test_expect_success setup '
# create template repository
test_commit A &&
test_commit B &&
test_commit C
'
test_expect_success 'push to update (protected)' '
setup_srcdst_basic &&
(
cd dst &&
test_commit D &&
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 &&
test_cmp expect actual
'
test_expect_success 'push to update (protected, forced)' '
setup_srcdst_basic &&
(
cd dst &&
test_commit D &&
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 &&
test_cmp expect actual
'
test_expect_success 'push to update (protected, tracking)' '
setup_srcdst_basic &&
(
cd src &&
git checkout master &&
test_commit D &&
git checkout HEAD^0
) &&
git ls-remote src refs/heads/master >expect &&
(
cd dst &&
test_commit E &&
git ls-remote . refs/remotes/origin/master >expect &&
test_must_fail git push --force-with-lease=master origin master &&
git ls-remote . refs/remotes/origin/master >actual &&
test_cmp expect actual
) &&
git ls-remote src refs/heads/master >actual &&
test_cmp expect actual
'
test_expect_success 'push to update (protected, tracking, forced)' '
setup_srcdst_basic &&
(
cd src &&
git checkout master &&
test_commit D &&
git checkout HEAD^0
) &&
(
cd dst &&
test_commit E &&
git ls-remote . refs/remotes/origin/master >expect &&
git push --force --force-with-lease=master origin master
) &&
git ls-remote dst refs/heads/master >expect &&
git ls-remote src refs/heads/master >actual &&
test_cmp expect actual
'
test_expect_success 'push to update (allowed)' '
setup_srcdst_basic &&
(
cd dst &&
test_commit D &&
git push --force-with-lease=master:master^ origin master
) &&
git ls-remote dst refs/heads/master >expect &&
git ls-remote src refs/heads/master >actual &&
test_cmp expect actual
'
test_expect_success 'push to update (allowed, tracking)' '
setup_srcdst_basic &&
(
cd dst &&
test_commit D &&
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 &&
test_cmp expect actual
'
test_expect_success 'push to update (allowed even though no-ff)' '
setup_srcdst_basic &&
(
cd dst &&
git reset --hard HEAD^ &&
test_commit D &&
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 &&
test_cmp expect actual
'
test_expect_success 'push to delete (protected)' '
setup_srcdst_basic &&
git ls-remote src refs/heads/master >expect &&
(
cd dst &&
test_must_fail git push --force-with-lease=master:master^ origin :master
) &&
git ls-remote src refs/heads/master >actual &&
test_cmp expect actual
'
test_expect_success 'push to delete (protected, forced)' '
setup_srcdst_basic &&
(
cd dst &&
git push --force --force-with-lease=master:master^ origin :master
) &&
>expect &&
git ls-remote src refs/heads/master >actual &&
test_cmp expect actual
'
test_expect_success 'push to delete (allowed)' '
setup_srcdst_basic &&
(
cd dst &&
git push --force-with-lease=master origin :master 2>err &&
grep deleted err
) &&
>expect &&
git ls-remote src refs/heads/master >actual &&
test_cmp expect actual
'
test_expect_success 'cover everything with default force-with-lease (protected)' '
setup_srcdst_basic &&
(
cd src &&
git branch naster master^
) &&
git ls-remote src refs/heads/\* >expect &&
(
cd dst &&
test_must_fail git push --force-with-lease origin master master:naster
) &&
git ls-remote src refs/heads/\* >actual &&
test_cmp expect actual
'
test_expect_success 'cover everything with default force-with-lease (allowed)' '
setup_srcdst_basic &&
(
cd src &&
git branch naster master^
) &&
(
cd dst &&
git fetch &&
git push --force-with-lease origin master master:naster
) &&
git ls-remote dst refs/heads/master |
sed -e "s/master/naster/" >expect &&
git ls-remote src refs/heads/naster >actual &&
test_cmp expect actual
'
test_expect_success 'new branch covered by force-with-lease' '
setup_srcdst_basic &&
(
cd dst &&
git branch branch master &&
git push --force-with-lease=branch origin branch
) &&
git ls-remote dst refs/heads/branch >expect &&
git ls-remote src refs/heads/branch >actual &&
test_cmp expect actual
'
test_expect_success 'new branch covered by force-with-lease (explicit)' '
setup_srcdst_basic &&
(
cd dst &&
git branch branch master &&
git push --force-with-lease=branch: origin branch
) &&
git ls-remote dst refs/heads/branch >expect &&
git ls-remote src refs/heads/branch >actual &&
test_cmp expect actual
'
test_expect_success 'new branch already exists' '
setup_srcdst_basic &&
(
cd src &&
git checkout -b branch master &&
test_commit c
) &&
(
cd dst &&
git branch branch master &&
test_must_fail git push --force-with-lease=branch: origin branch
)
'
test_done