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>
Felipe Contreras committed
Apr 20, 2014 at 13:59 UTC
9193f742350d1b97e32b0687d1577dc2b2a0d713
2 files changed
+18
-1
t/t5801-remote-helpers.sh
+8
@@ -94,6 +94,14 @@ test_expect_success 'push new branch with old:new refspec' '
94
compare_refs local HEAD server refs/heads/new-refspec
95
'
96
97
+test_expect_success 'push new branch with HEAD:new refspec' '
98
+ (cd local &&
99
+ git checkout new-name
100
+ git push origin HEAD:new-refspec-2
101
+ ) &&
102
+ compare_refs local HEAD server refs/heads/new-refspec-2
103
+'
104
+
105
test_expect_success 'forced push' '
106
(cd local &&
107
git checkout -b force-test &&
transport-helper.c
+10
-1
@@ -896,7 +896,16 @@ static int push_refs_with_export(struct transport *transport,
896
if (ref->peer_ref) {
897
if (strcmp(ref->name, ref->peer_ref->name)) {
898
struct strbuf buf = STRBUF_INIT;
899
- strbuf_addf(&buf, "%s:%s", ref->peer_ref->name, ref->name);
899
+ const char *name;
900
+ int flag;
901
+
902
+ /* Follow symbolic refs (mainly for HEAD). */
903
+ name = resolve_ref_unsafe(ref->peer_ref->name, sha1, 1, &flag);
904
+ if (!name || !(flag & REF_ISSYMREF))
905
+ name = ref->peer_ref->name;
906
+
907
+ strbuf_addf(&buf, "%s:%s", name, ref->name);
908
+
909
string_list_append(&revlist_args, "--refspec");
910
string_list_append(&revlist_args, buf.buf);
911
strbuf_release(&buf);