summaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2009-01-17 18:08:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-20 00:36:34 (GMT)
commitaa9c55b66719c86896d134d35de8c263c078a481 (patch)
tree3a979a00c3fa6b01d594c4039eaf337980ab8e80 /sha1_name.c
parentc2883e62f5b9980e5402431f2261c961354d0f15 (diff)
downloadgit-aa9c55b66719c86896d134d35de8c263c078a481.zip
git-aa9c55b66719c86896d134d35de8c263c078a481.tar.gz
git-aa9c55b66719c86896d134d35de8c263c078a481.tar.bz2
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 @{-<N>} notation. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
-rw-r--r--sha1_name.c25
1 files changed, 24 insertions, 1 deletions
diff --git a/sha1_name.c b/sha1_name.c
index d6972f2..9d544a2 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 @{-<n>}.
+ */
+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;