sha1_name: reorganize get_sha1_basic()
Through the years the functionality to handle @{-N} and @{u} has moved around the code, and as a result, code that once made sense, doesn't any more. There is no need to call this function recursively with the branch of @{-N} substituted because dwim_{ref,log} already replaces it. However, there's one corner-case where @{-N} resolves to a detached HEAD, in which case we wouldn't get any ref back. So we parse the nth-prior manually, and deal with it depending on whether it's a SHA-1, or a ref. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
May 7, 2013 at 16:55 UTC
128fd54daeff23fbef0d0b7ec1a31f38d0803f63
1 file changed
+19
-11
sha1_name.c
+19
-11
@@ -431,13 +431,14 @@ static inline int upstream_mark(const char *string, int len)
431
}
432
433
static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags);
434
+static int interpret_nth_prior_checkout(const char *name, struct strbuf *buf);
435
436
static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
437
{
438
static const char *warn_msg = "refname '%.*s' is ambiguous.";
439
char *real_ref = NULL;
440
int refs_found = 0;
440
- int at, reflog_len;
441
+ int at, reflog_len, nth_prior = 0;
442
443
if (len == 40 && !get_sha1_hex(str, sha1))
444
return 0;
@@ -447,6 +448,10 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
448
if (len && str[len-1] == '}') {
449
for (at = len-4; at >= 0; at--) {
450
if (str[at] == '@' && str[at+1] == '{') {
451
+ if (at == 0 && str[2] == '-') {
452
+ nth_prior = 1;
453
+ continue;
454
+ }
455
if (!upstream_mark(str + at, len - at)) {
456
reflog_len = (len-1) - (at+2);
457
len = at;
@@ -460,19 +465,22 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
465
if (len && ambiguous_path(str, len))
466
return -1;
467
463
- if (!len && reflog_len) {
468
+ if (nth_prior) {
469
struct strbuf buf = STRBUF_INIT;
465
- int ret;
466
- /* try the @{-N} syntax for n-th checkout */
467
- ret = interpret_branch_name(str, &buf);
468
- if (ret > 0)
469
- /* substitute this branch name and restart */
470
- return get_sha1_1(buf.buf, buf.len, sha1, 0);
471
- else if (ret == 0)
472
- return -1;
470
+ int detached;
471
+
472
+ if (interpret_nth_prior_checkout(str, &buf) > 0) {
473
+ detached = (buf.len == 40 && !get_sha1_hex(buf.buf, sha1));
474
+ strbuf_release(&buf);
475
+ if (detached)
476
+ return 0;
477
+ }
478
+ }
479
+
480
+ if (!len && reflog_len)
481
/* allow "@{...}" to mean the current branch reflog */
482
refs_found = dwim_ref("HEAD", 4, sha1, &real_ref);
475
- } else if (reflog_len)
483
+ else if (reflog_len)
484
refs_found = dwim_log(str, len, sha1, &real_ref);
485
else
486
refs_found = dwim_ref(str, len, sha1, &real_ref);