mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Add new @ shortcut for HEAD"

Browse Source 
This reverts commit cdfd94837b, as it
does not just apply to "@" (and forms with modifiers like @{u}
applied to it), but also affects e.g. "refs/heads/@/foo", which it
shouldn't.

The basic idea of giving a short-hand might be good, and the topic
can be retried later, but let's revert to avoid affecting existing
use cases for now for the upcoming release.
This commit is contained in:
Junio C Hamano
2013-08-14 10:57:24 -07:00
parent c1ebd90c83
commit 2c2b6646c2
5 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sha1_name.c
View File

@ -1004,17 +1004,6 @@ int get_sha1_mb(const char *name, unsigned char *sha1)
return st;
}
/* parse @something syntax, when 'something' is not {.*} */
static int interpret_empty_at(const char *name, int namelen, int len, struct strbuf *buf)
{
if (len || name[1] == '{')
return -1;
strbuf_reset(buf);
strbuf_add(buf, "HEAD", 4);
return 1;
}
static int reinterpret(const char *name, int namelen, int len, struct strbuf *buf)
{
/* we have extra data, which might need further processing */
@ -1077,15 +1066,9 @@ int interpret_branch_name(const char *name, struct strbuf *buf)
cp = strchr(name, '@');
if (!cp)
return -1;
len = interpret_empty_at(name, namelen, cp - name, buf);
if (len > 0)
return reinterpret(name, namelen, len, buf);
tmp_len = upstream_mark(cp, namelen - (cp - name));
if (!tmp_len)
return -1;
len = cp + tmp_len - name;
cp = xstrndup(name, cp - name);
upstream = branch_get(*cp ? cp : NULL);