| commit | 90e6255a6d01760d13d8ac635cca5819b0b4dbc5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Mar 2014 20:49:32 +0000 (18 13:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Mar 2014 20:49:33 +0000 (18 13:49 -0700) | ||
| tree | ae04f89b4316b70e09807479c3edd949751c4c20 | treesnapshot (tar.gz zip) |
| parent | decba94d2c664229d16ee7c3cc442c0ada6090b9 | commitdiff |
| parent | a7cb1276cc263446b19b43d3a7784cbc72f84e28 | commitdiff |
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
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