diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-14 03:13:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-14 03:13:30 -0800 |
| commit | bcd2e266a6270254212603e90186251116d3cd16 (patch) | |
| tree | c0ba0c5c778a770947c22b273b9492853c4d5522 /transport.c | |
| parent | 2d4eb71c6c06e8f15351d996a9413974e15cab0b (diff) | |
| parent | ff206748158aa54196bde1462ceaf550a5c2440e (diff) | |
| download | git-bcd2e266a6270254212603e90186251116d3cd16.tar.gz | |
Merge branch 'aw/mirror-push' into jk/send-pack
* aw/mirror-push:
git-push: add documentation for the newly added --mirror mode
Add tests for git push'es mirror mode
git-push: plumb in --mirror mode
Teach send-pack a mirror mode
send-pack: segfault fix on forced push
send-pack: require --verbose to show update of tracking refs
receive-pack: don't mention successful updates
more terse push output
Conflicts:
transport.c
transport.h
Diffstat (limited to 'transport.c')
| -rw-r--r-- | transport.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/transport.c b/transport.c index 5cb809bff6..8d9bdbe8de 100644 --- a/transport.c +++ b/transport.c @@ -284,6 +284,9 @@ static int rsync_transport_push(struct transport *transport, struct child_process rsync; const char *args[10]; + if (flags & TRANSPORT_PUSH_MIRROR) + return error("rsync transport does not support mirror mode"); + /* first push the objects */ strbuf_addstr(&buf, transport->url); @@ -387,6 +390,9 @@ static int curl_transport_push(struct transport *transport, int refspec_nr, cons int argc; int err; + if (flags & TRANSPORT_PUSH_MIRROR) + return error("http transport does not support mirror mode"); + argv = xmalloc((refspec_nr + 12) * sizeof(char *)); argv[0] = "http-push"; argc = 1; @@ -657,6 +663,7 @@ static int git_transport_push(struct transport *transport, int refspec_nr, const args.receivepack = data->receivepack; args.send_all = !!(flags & TRANSPORT_PUSH_ALL); + args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR); args.force_update = !!(flags & TRANSPORT_PUSH_FORCE); args.use_thin_pack = data->thin; args.verbose = !!(flags & TRANSPORT_PUSH_VERBOSE); |