From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 Mar 2018 20:36:27 +0000 (-0800)
Subject: Merge branch 'ds/mark-parents-uninteresting-optim'
X-Git-Tag: v2.17.0-rc0~25
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d5120daba4f91c97fb9eb77e32f0f9e009bb515a?hp=7519a60ffa3f811ec49fd9956e284ff90f3b1cf1

Merge branch 'ds/mark-parents-uninteresting-optim'

Micro optimization in revision traversal code.

* ds/mark-parents-uninteresting-optim:
revision.c: reduce object database queries
---

diff --git a/revision.c b/revision.c
index 5c1cb7277c..b42c836d7a 100644
--- a/revision.c
+++ b/revision.c
@@ -113,7 +113,8 @@ void mark_parents_uninteresting(struct commit *commit)
 			 * it is popped next time around, we won't be trying
 			 * to parse it and get an error.
 			 */
-			if (!has_object_file(&commit->object.oid))
+			if (!commit->object.parsed &&
+			    !has_object_file(&commit->object.oid))
 				commit->object.parsed = 1;
 
 			if (commit->object.flags & UNINTERESTING)