From aa9c55b66719c86896d134d35de8c263c078a481 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 17 Jan 2009 19:08:12 +0100 Subject: [PATCH] Fix parsing of @{-1}@{1} To do that, Git no longer looks forward for the '@{' corresponding to the closing '}' but backward, and dwim_ref() as well as dwim_log() learnt about the @{-} notation. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- sha1_name.c | 25 ++++++++++++++++++++++++- t/t1505-rev-parse-last.sh | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index d6972f2d6..9d544a263 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -238,8 +238,28 @@ static int ambiguous_path(const char *path, int len) return slash; } +/* + * *string and *len will only be substituted, and *string returned (for + * later free()ing) if the string passed in is of the form @{-}. + */ +static char *substitute_nth_last_branch(const char **string, int *len) +{ + struct strbuf buf = STRBUF_INIT; + int ret = interpret_nth_last_branch(*string, &buf); + + if (ret == *len) { + size_t size; + *string = strbuf_detach(&buf, &size); + *len = size; + return (char *)*string; + } + + return NULL; +} + int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref) { + char *last_branch = substitute_nth_last_branch(&str, &len); const char **p, *r; int refs_found = 0; @@ -259,11 +279,13 @@ int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref) break; } } + free(last_branch); return refs_found; } int dwim_log(const char *str, int len, unsigned char *sha1, char **log) { + char *last_branch = substitute_nth_last_branch(&str, &len); const char **p; int logs_found = 0; @@ -294,6 +316,7 @@ int dwim_log(const char *str, int len, unsigned char *sha1, char **log) if (!warn_ambiguous_refs) break; } + free(last_branch); return logs_found; } @@ -312,7 +335,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1) /* basic@{time or number or -number} format to query ref-log */ reflog_len = at = 0; if (str[len-1] == '}') { - for (at = 0; at < len - 1; at++) { + for (at = len-2; at >= 0; at--) { if (str[at] == '@' && str[at+1] == '{') { reflog_len = (len-1) - (at+2); len = at; diff --git a/t/t1505-rev-parse-last.sh b/t/t1505-rev-parse-last.sh index 1e49dd2c8..c745ec437 100755 --- a/t/t1505-rev-parse-last.sh +++ b/t/t1505-rev-parse-last.sh @@ -54,7 +54,7 @@ test_expect_success '@{-1}^2 works' ' test_rev_equivalent side^2 @{-1}^2 ' -test_expect_failure '@{-1}@{1} works' ' +test_expect_success '@{-1}@{1} works' ' test_rev_equivalent side@{1} @{-1}@{1} ' -- 2.26.2