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 /builtin-push.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 'builtin-push.c')
| -rw-r--r-- | builtin-push.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/builtin-push.c b/builtin-push.c index 9f727c00f..b68c6813b 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -44,15 +44,6 @@ static void set_refspecs(const char **refs, int nr) strcat(tag, refs[i]); ref = tag; } - if (!strcmp("HEAD", ref)) { - unsigned char sha1_dummy[20]; - ref = resolve_ref(ref, sha1_dummy, 1, NULL); - if (!ref) - die("HEAD cannot be resolved."); - if (prefixcmp(ref, "refs/heads/")) - die("HEAD cannot be resolved to branch."); - ref = xstrdup(ref + 11); - } add_refspec(ref); } } |