summaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-08-14 10:57:24 -0700
committerJunio C Hamano <gitster@pobox.com>2013-08-14 15:04:24 -0700
commit2c2b6646c2723459dbd334c7ced6f77ffb0d596e (patch)
tree2db617e34a62cc84d1c744e14913b916202eb820 /sha1_name.c
parentc1ebd90c832e28ff27654c21f9985aebe986352d (diff)
downloadgit-2c2b6646c2723459dbd334c7ced6f77ffb0d596e.tar.gz
Revert "Add new @ shortcut for HEAD"
This reverts commit cdfd94837b27c220f70f032b596ea993d195488f, 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.
Diffstat (limited to 'sha1_name.c')
-rw-r--r--sha1_name.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/sha1_name.c b/sha1_name.c
index 852dd951dc..65ad066d9b 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -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);