OSDN Git Service

assume parse_commit checks commit->object.parsed
authorJeff King <peff@peff.net>
Thu, 24 Oct 2013 08:53:01 +0000 (04:53 -0400)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Oct 2013 22:43:50 +0000 (15:43 -0700)
The parse_commit function will check the "parsed" flag of
the object and do nothing if it is set. There is no need
for callers to check the flag themselves, and doing so only
clutters the code.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/blame.c
builtin/name-rev.c
builtin/show-branch.c
fetch-pack.c

index 079dcd3..4d25466 100644 (file)
@@ -1554,8 +1554,7 @@ static void assign_blame(struct scoreboard *sb, int opt)
                 */
                origin_incref(suspect);
                commit = suspect->commit;
-               if (!commit->object.parsed)
-                       parse_commit(commit);
+               parse_commit(commit);
                if (reverse ||
                    (!(commit->object.flags & UNINTERESTING) &&
                     !(revs->max_age != -1 && commit->date < revs->max_age)))
index 0aaa19e..26f4033 100644 (file)
@@ -27,8 +27,7 @@ static void name_rev(struct commit *commit,
        struct commit_list *parents;
        int parent_number = 1;
 
-       if (!commit->object.parsed)
-               parse_commit(commit);
+       parse_commit(commit);
 
        if (commit->date < cutoff)
                return;
index 9788eb1..3afc79b 100644 (file)
@@ -227,8 +227,7 @@ static void join_revs(struct commit_list **list_p,
                        parents = parents->next;
                        if ((this_flag & flags) == flags)
                                continue;
-                       if (!p->object.parsed)
-                               parse_commit(p);
+                       parse_commit(p);
                        if (mark_seen(p, seen_p) && !still_interesting)
                                extra--;
                        p->object.flags |= flags;
index 6684348..86b6977 100644 (file)
@@ -46,9 +46,8 @@ static void rev_list_push(struct commit *commit, int mark)
        if (!(commit->object.flags & mark)) {
                commit->object.flags |= mark;
 
-               if (!(commit->object.parsed))
-                       if (parse_commit(commit))
-                               return;
+               if (parse_commit(commit))
+                       return;
 
                prio_queue_put(&rev_list, commit);
 
@@ -127,8 +126,7 @@ static const unsigned char *get_rev(void)
                        return NULL;
 
                commit = prio_queue_get(&rev_list);
-               if (!commit->object.parsed)
-                       parse_commit(commit);
+               parse_commit(commit);
                parents = commit->parents;
 
                commit->object.flags |= POPPED;