diff options
| author | Jeff King <peff@peff.net> | 2010-01-28 04:56:43 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-28 12:12:50 -0800 |
| commit | 12a258c078da3481a5735a7dca00bbe75cd4713b (patch) | |
| tree | 41f0b1629f18dc9075db04571102b70fbcde15d9 /sha1_name.c | |
| parent | d46a8301930ae83de30fbbbbce1bb02a98745204 (diff) | |
| download | git-12a258c078da3481a5735a7dca00bbe75cd4713b.tar.gz | |
reject @{-1} not at beginning of object name
Something like foo@{-1} is nonsensical, as the @{-N} syntax
is reserved for "the Nth last branch", and is not an actual
reflog selector. We should not feed such nonsense to
approxidate at all.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sha1_name.c b/sha1_name.c index 00fc415178..77299257bf 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -399,6 +399,10 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1) unsigned long co_time; int co_tz, co_cnt; + /* a @{-N} placed anywhere except the start is an error */ + if (str[at+2] == '-') + return -1; + /* Is it asking for N-th entry, or approxidate? */ for (i = nth = 0; 0 <= nth && i < reflog_len; i++) { char ch = str[at+2+i]; |