diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-18 20:49:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-18 20:49:33 (GMT) |
| commit | 90e6255a6d01760d13d8ac635cca5819b0b4dbc5 (patch) | |
| tree | ae04f89b4316b70e09807479c3edd949751c4c20 /contrib/remote-helpers/test-hg.sh | |
| parent | decba94d2c664229d16ee7c3cc442c0ada6090b9 (diff) | |
| parent | a7cb1276cc263446b19b43d3a7784cbc72f84e28 (diff) | |
| download | git-90e6255a6d01760d13d8ac635cca5819b0b4dbc5.zip git-90e6255a6d01760d13d8ac635cca5819b0b4dbc5.tar.gz git-90e6255a6d01760d13d8ac635cca5819b0b4dbc5.tar.bz2 | |
Merge branch 'fc/transport-helper-fixes'
Updates transport-helper, fast-import and fast-export to allow the
ref mapping and ref deletion in a way similar to the natively
supported transports.
* fc/transport-helper-fixes:
remote-bzr: support the new 'force' option
test-hg.sh: tests are now expected to pass
transport-helper.c: do not overwrite forced bit
transport-helper: check for 'forced update' message
transport-helper: add 'force' to 'export' helpers
transport-helper: don't update refs in dry-run
transport-helper: mismerge fix
Diffstat (limited to 'contrib/remote-helpers/test-hg.sh')
| -rwxr-xr-x | contrib/remote-helpers/test-hg.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index 5d128a5..a933b1e 100755 --- a/contrib/remote-helpers/test-hg.sh +++ b/contrib/remote-helpers/test-hg.sh @@ -680,7 +680,7 @@ test_expect_success 'remote big push fetch first' ' ) ' -test_expect_failure 'remote big push force' ' +test_expect_success 'remote big push force' ' test_when_finished "rm -rf hgrepo gitrepo*" && setup_big_push @@ -710,7 +710,7 @@ test_expect_failure 'remote big push force' ' check_bookmark hgrepo new_bmark six ' -test_expect_failure 'remote big push dry-run' ' +test_expect_success 'remote big push dry-run' ' test_when_finished "rm -rf hgrepo gitrepo*" && setup_big_push |