Skip to content

Commit 0064053

Browse files
peffgitster
authored andcommitted
assume parse_commit checks commit->object.parsed
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7059dcc commit 0064053

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

builtin/blame.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1554,8 +1554,7 @@ static void assign_blame(struct scoreboard *sb, int opt)
15541554
*/
15551555
origin_incref(suspect);
15561556
commit = suspect->commit;
1557-
if (!commit->object.parsed)
1558-
parse_commit(commit);
1557+
parse_commit(commit);
15591558
if (reverse ||
15601559
(!(commit->object.flags & UNINTERESTING) &&
15611560
!(revs->max_age != -1 && commit->date < revs->max_age)))

builtin/name-rev.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ static void name_rev(struct commit *commit,
2727
struct commit_list *parents;
2828
int parent_number = 1;
2929

30-
if (!commit->object.parsed)
31-
parse_commit(commit);
30+
parse_commit(commit);
3231

3332
if (commit->date < cutoff)
3433
return;

builtin/show-branch.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,7 @@ static void join_revs(struct commit_list **list_p,
227227
parents = parents->next;
228228
if ((this_flag & flags) == flags)
229229
continue;
230-
if (!p->object.parsed)
231-
parse_commit(p);
230+
parse_commit(p);
232231
if (mark_seen(p, seen_p) && !still_interesting)
233232
extra--;
234233
p->object.flags |= flags;

fetch-pack.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,8 @@ static void rev_list_push(struct commit *commit, int mark)
4646
if (!(commit->object.flags & mark)) {
4747
commit->object.flags |= mark;
4848

49-
if (!(commit->object.parsed))
50-
if (parse_commit(commit))
51-
return;
49+
if (parse_commit(commit))
50+
return;
5251

5352
prio_queue_put(&rev_list, commit);
5453

@@ -127,8 +126,7 @@ static const unsigned char *get_rev(void)
127126
return NULL;
128127

129128
commit = prio_queue_get(&rev_list);
130-
if (!commit->object.parsed)
131-
parse_commit(commit);
129+
parse_commit(commit);
132130
parents = commit->parents;
133131

134132
commit->object.flags |= POPPED;

0 commit comments

Comments
 (0)