[PATCH v6 p2 5/9] transport-helper: fix pushing with straight refspec
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Nov 24, 2012, 03:25 UTC
- Message-ID
- <1353727520-26039-6-git-send-email-felipe.contreras@gmail.com>
- In-Reply-To
- <1353727520-26039-1-git-send-email-felipe.contreras@gmail.com>
For example '*:*'.
Obviously '^refs/heads/master refs/heads/master' is not going to work, so lets check that the ref we are negating is not the same we are pushing.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- t/t5801-remote-helpers.sh | 2 +- transport-helper.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index b268cd2..9c7871b 100755 --- a/t/t5801-remote-helpers.sh +++ b/t/t5801-remote-helpers.sh @@ -126,7 +126,7 @@ test_expect_success 'pulling with straight refspec' ' compare_refs local2 HEAD server HEAD ' -test_expect_failure 'pushing with straight refspec' ' +test_expect_success 'pushing with straight refspec' ' test_when_finished "(cd local2 && git reset --hard origin)" && (cd local2 && echo content >>file && diff --git a/transport-helper.c b/transport-helper.c index 899eb36..6dbb72e 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -784,7 +784,7 @@ static int push_refs_with_export(struct transport *transport, if (!data->refspecs) continue; private = apply_refspecs(data->refspecs, data->refspec_nr, ref->name); - if (private && !get_sha1(private, sha1)) { + if (private && strcmp(private, ref->name) && !get_sha1(private, sha1)) { strbuf_addf(&buf, "^%s", private); string_list_append(&revlist_args, strbuf_detach(&buf, NULL)); }
-- 1.8.0