diff options
| author | Shawn Pearce <spearce@spearce.org> | 2006-05-19 03:29:43 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-19 15:02:55 -0700 |
| commit | cce91a2caef9296bd4a69e51e48f1d679935d868 (patch) | |
| tree | f07d98e7d05398013e29bc35a95693489a5a77c2 /sha1_name.c | |
| parent | d0740d92beb019a7b02678e5acea79c0ff67e3ee (diff) | |
| download | git-cce91a2caef9296bd4a69e51e48f1d679935d868.tar.gz git-cce91a2caef9296bd4a69e51e48f1d679935d868.tar.xz | |
Change 'master@noon' syntax to 'master@{noon}'.
Its ambiguous to parse "master@2006-05-17 18:30:foo" when foo is
meant as a file name and ":30" is meant as 30 minutes past 6 pm.
Therefore all date specifications in a sha1 expression must now
appear within brackets and the ':' splitter used for the path name
in a sha1 expression ignores ':' appearing within brackets.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/sha1_name.c b/sha1_name.c index 4376cb392..fbbde1cf7 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -249,7 +249,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1) static const char *warning = "warning: refname '%.*s' is ambiguous.\n"; const char **p, *pathname; char *real_path = NULL; - int refs_found = 0, at_mark; + int refs_found = 0, am; unsigned long at_time = (unsigned long)-1; unsigned char *this_result; unsigned char sha1_from_ref[20]; @@ -257,16 +257,16 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1) if (len == 40 && !get_sha1_hex(str, sha1)) return 0; - /* At a given period of time? "@2 hours ago" */ - for (at_mark = 1; at_mark < len; at_mark++) { - if (str[at_mark] == '@') { - int date_len = len - at_mark - 1; + /* At a given period of time? "@{2 hours ago}" */ + for (am = 1; am < len - 1; am++) { + if (str[am] == '@' && str[am+1] == '{' && str[len-1] == '}') { + int date_len = len - am - 3; char *date_spec = xmalloc(date_len + 1); - strncpy(date_spec, str + at_mark + 1, date_len); + strncpy(date_spec, str + am + 2, date_len); date_spec[date_len] = 0; at_time = approxidate(date_spec); free(date_spec); - len = at_mark; + len = am; break; } } @@ -482,7 +482,7 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1) */ int get_sha1(const char *name, unsigned char *sha1) { - int ret; + int ret, bracket_depth; unsigned unused; int namelen = strlen(name); const char *cp; @@ -528,8 +528,15 @@ int get_sha1(const char *name, unsigned char *sha1) } return -1; } - cp = strchr(name, ':'); - if (cp) { + for (cp = name, bracket_depth = 0; *cp; cp++) { + if (*cp == '{') + bracket_depth++; + else if (bracket_depth && *cp == '}') + bracket_depth--; + else if (!bracket_depth && *cp == ':') + break; + } + if (*cp == ':') { unsigned char tree_sha1[20]; if (!get_sha1_1(name, cp-name, tree_sha1)) return get_tree_entry(tree_sha1, cp+1, sha1, |