Code

Fix log -g this@{upstream}
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Jan 2010 21:48:28 +0000 (13:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Jan 2010 21:49:50 +0000 (13:49 -0800)
It showed the correct objects but walked a wrong reflog.
Again, tests are from Jeff King.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
revision.c
t/t1507-rev-parse-upstream.sh

index f54d43ffb39dcd3600e85458b93e624a2a6ab159..3ba6d991f6e9789949c314c2981dfc6b208a6f66 100644 (file)
@@ -134,10 +134,20 @@ static void add_pending_object_with_mode(struct rev_info *revs, struct object *o
 {
        if (revs->no_walk && (obj->flags & UNINTERESTING))
                revs->no_walk = 0;
-       if (revs->reflog_info && obj->type == OBJ_COMMIT &&
-                       add_reflog_for_walk(revs->reflog_info,
-                               (struct commit *)obj, name))
-               return;
+       if (revs->reflog_info && obj->type == OBJ_COMMIT) {
+               struct strbuf buf = STRBUF_INIT;
+               int len = interpret_branch_name(name, &buf);
+               int st;
+
+               if (0 < len && name[len] && buf.len)
+                       strbuf_addstr(&buf, name + len);
+               st = add_reflog_for_walk(revs->reflog_info,
+                                        (struct commit *)obj,
+                                        buf.buf[0] ? buf.buf: name);
+               strbuf_release(&buf);
+               if (st)
+                       return;
+       }
        add_object_array_with_mode(obj, name, &revs->pending, mode);
 }
 
index 95c9b0923f19782f8d40c36fd82d5e75d9f8f9b5..8c8dfdaf9f037f370629f419af02aa7a9d75f613 100755 (executable)
@@ -107,4 +107,33 @@ test_expect_success 'checkout other@{u}' '
        test_cmp expect actual
 '
 
+cat >expect <<EOF
+commit 8f489d01d0cc65c3b0f09504ec50b5ed02a70bd5
+Reflog: master@{0} (C O Mitter <committer@example.com>)
+Reflog message: branch: Created from HEAD
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
+
+    3
+EOF
+test_expect_success 'log -g other@{u}' '
+       git log -1 -g other@{u} >actual &&
+       test_cmp expect actual
+'
+
+cat >expect <<EOF
+commit 8f489d01d0cc65c3b0f09504ec50b5ed02a70bd5
+Reflog: master@{Thu Apr 7 15:17:13 2005 -0700} (C O Mitter <committer@example.com>)
+Reflog message: branch: Created from HEAD
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
+
+    3
+EOF
+
+test_expect_success 'log -g other@{u}@{now}' '
+       git log -1 -g other@{u}@{now} >actual &&
+       test_cmp expect actual
+'
+
 test_done