diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-05-24 21:30:04 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-28 08:02:25 -0700 |
| commit | c9eaef125bbecd60a8b328d58e66306d5db1357a (patch) | |
| tree | c6444803cf4188a4f6502c7192b3299ad8e2f186 /contrib/remote-helpers/test-hg.sh | |
| parent | e3751a1763112b301f2269dd268190900d7ddd29 (diff) | |
| download | git-c9eaef125bbecd60a8b328d58e66306d5db1357a.tar.gz | |
remote-hg: add support for --force
And get rid of the remote-hg.force-push option hack.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/remote-helpers/test-hg.sh')
| -rwxr-xr-x | contrib/remote-helpers/test-hg.sh | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index 51f3c03875..f7ce8aa853 100755 --- a/contrib/remote-helpers/test-hg.sh +++ b/contrib/remote-helpers/test-hg.sh @@ -68,6 +68,9 @@ check_push () { 'fetch-first') grep "^ ! \[rejected\] *${branch} -> ${branch} (fetch first)$" error || ref_ret=1 ;; + 'forced-update') + grep "^ + [a-f0-9]*\.\.\.[a-f0-9]* *${branch} -> ${branch} (forced update)$" error || ref_ret=1 + ;; '') grep "^ [a-f0-9]*\.\.[a-f0-9]* *${branch} -> ${branch}$" error || ref_ret=1 ;; @@ -594,6 +597,36 @@ test_expect_success 'remote big push fetch first' ' ) ' +test_expect_failure 'remote big push force' ' + test_when_finished "rm -rf hgrepo gitrepo*" && + + setup_big_push + + ( + cd gitrepo && + + check_push 0 --force --all <<-EOF + master + good_bmark + branches/good_branch + new_bmark:new + branches/new_branch:new + bad_bmark1:forced-update + bad_bmark2:forced-update + branches/bad_branch:forced-update + EOF + ) && + + check_branch hgrepo default six && + check_branch hgrepo good_branch eight && + check_branch hgrepo bad_branch nine && + check_branch hgrepo new_branch ten && + check_bookmark hgrepo good_bmark three && + check_bookmark hgrepo bad_bmark1 four && + check_bookmark hgrepo bad_bmark2 five && + check_bookmark hgrepo new_bmark six +' + test_expect_failure 'remote big push dry-run' ' test_when_finished "rm -rf hgrepo gitrepo*" && |