-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
t5533: test "push --force-with-lease"
Prepare two repositories, src and dst, the latter of which is a clone of the former (with tracking branches), and push from the latter into the former, with various --force-with-lease options. Signed-off-by: Junio C Hamano <gitster@pobox.com>
- Loading branch information
Junio C Hamano
committed
Jul 23, 2013
1 parent
631b5ef
commit d887cc1
Showing
1 changed file
with
189 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,189 @@ | ||
#!/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 | ||
) && | ||
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 | ||
) && | ||
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 | ||
) && | ||
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 | ||
) && | ||
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 | ||
) && | ||
>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_done |