diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2014-04-20 13:59:26 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-04-21 11:47:33 -0700 |
| commit | 9193f742350d1b97e32b0687d1577dc2b2a0d713 (patch) | |
| tree | ad7f147dc27861e5d0d56ff3c3047f1976d46fd5 | |
| parent | transport-helper: add support for old:new refspec (diff) | |
| download | tgif-9193f742350d1b97e32b0687d1577dc2b2a0d713.tar.xz | |
transport-helper: add support to push symbolic refs
For example 'HEAD'.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t5801-remote-helpers.sh | 8 | ||||
| -rw-r--r-- | transport-helper.c | 11 |
2 files changed, 18 insertions, 1 deletions
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index 52b3c99478..828866930d 100755 --- a/t/t5801-remote-helpers.sh +++ b/t/t5801-remote-helpers.sh @@ -94,6 +94,14 @@ test_expect_success 'push new branch with old:new refspec' ' compare_refs local HEAD server refs/heads/new-refspec ' +test_expect_success 'push new branch with HEAD:new refspec' ' + (cd local && + git checkout new-name + git push origin HEAD:new-refspec-2 + ) && + compare_refs local HEAD server refs/heads/new-refspec-2 +' + test_expect_success 'forced push' ' (cd local && git checkout -b force-test && diff --git a/transport-helper.c b/transport-helper.c index 3f45c478fa..f74eb57046 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -896,7 +896,16 @@ static int push_refs_with_export(struct transport *transport, if (ref->peer_ref) { if (strcmp(ref->name, ref->peer_ref->name)) { struct strbuf buf = STRBUF_INIT; - strbuf_addf(&buf, "%s:%s", ref->peer_ref->name, ref->name); + const char *name; + int flag; + + /* Follow symbolic refs (mainly for HEAD). */ + name = resolve_ref_unsafe(ref->peer_ref->name, sha1, 1, &flag); + if (!name || !(flag & REF_ISSYMREF)) + name = ref->peer_ref->name; + + strbuf_addf(&buf, "%s:%s", name, ref->name); + string_list_append(&revlist_args, "--refspec"); string_list_append(&revlist_args, buf.buf); strbuf_release(&buf); |