diff options
| author | Daniel Barkalow <barkalow@iabervon.org> | 2008-02-20 12:54:05 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-20 11:06:27 -0800 |
| commit | 9f0ea7e8283da126c8e1d5e0c3b39c39200258ad (patch) | |
| tree | 37bb16b202bee3a60f65481455fbe0f661335075 /remote.c | |
| parent | e3c58f8b300dbc80b97a31a3a2758de00c5b52ce (diff) | |
| download | git-9f0ea7e8283da126c8e1d5e0c3b39c39200258ad.tar.gz git-9f0ea7e8283da126c8e1d5e0c3b39c39200258ad.tar.xz | |
Resolve value supplied for no-colon push refspecs
When pushing a refspec like "HEAD", we used to treat it as
"HEAD:HEAD", which didn't work without rewriting. Instead, we should
resolve the ref. If it's a symref, further require it to point to a
branch, to avoid doing anything especially unexpected. Also remove the
rewriting previously added in builtin-push.
Since the code for "HEAD" uses the regular refspec parsing, it
automatically handles "+HEAD" without anything special.
[jc: added a further test to make sure that "remote.*.push = HEAD" works]
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'remote.c')
| -rw-r--r-- | remote.c | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -643,9 +643,17 @@ static int match_explicit(struct ref *src, struct ref *dst, errs = 1; if (!dst_value) { + unsigned char sha1[20]; + int flag; + if (!matched_src) return errs; - dst_value = matched_src->name; + dst_value = resolve_ref(matched_src->name, sha1, 1, &flag); + if (!dst_value || + ((flag & REF_ISSYMREF) && + prefixcmp(dst_value, "refs/heads/"))) + die("%s cannot be resolved to branch.", + matched_src->name); } switch (count_refspec_match(dst_value, dst, &matched_dst)) { |