[v2,02/10] revision: parse parent in indegree_walk_step()

Message ID	cf61239f9332a9cd91110a9b6319b1133ff3bd27.1596941624.git.gitgitgadget@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <SRS0=dguO=BT=vger.kernel.org=git-owner@kernel.org> Message-Id: <cf61239f9332a9cd91110a9b6319b1133ff3bd27.1596941624.git.gitgitgadget@gmail.com> In-Reply-To: <pull.676.v2.git.1596941624.gitgitgadget@gmail.com> References: <pull.676.git.1595927632.gitgitgadget@gmail.com> <pull.676.v2.git.1596941624.gitgitgadget@gmail.com> From: "Abhishek Kumar via GitGitGadget" <gitgitgadget@gmail.com> Date: Sun, 09 Aug 2020 02:53:36 +0000 Subject: [PATCH v2 02/10] revision: parse parent in indegree_walk_step() Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Derrick Stolee <stolee@gmail.com>, Jakub =?utf-8?b?TmFyxJlic2tp?= <jnareb@gmail.com>, Taylor Blau <me@ttaylor.com>, Abhishek Kumar <abhishekkumar8222@gmail.com>, Abhishek Kumar <abhishekkumar8222@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk
Series	Implement Corrected Commit Date \| expand [v2,00/10,GSoC] Implement Corrected Commit Date [v2,01/10] commit-graph: fix regression when computing bloom filter [v2,02/10] revision: parse parent in indegree_walk_step() [v2,03/10] commit-graph: consolidate fill_commit_graph_info [v2,04/10] commit-graph: consolidate compare_commits_by_gen [v2,05/10] commit-graph: implement generation data chunk [v2,06/10] commit-graph: return 64-bit generation number [v2,07/10] commit-graph: implement corrected commit date [v2,08/10] commit-graph: handle mixed generation commit chains [v2,09/10] commit-reach: use corrected commit dates in paint_down_to_common() [v2,10/10] doc: add corrected commit date info

Message ID

cf61239f9332a9cd91110a9b6319b1133ff3bd27.1596941624.git.gitgitgadget@gmail.com (mailing list archive)

State

Superseded

Headers

Message-Id: 
 <cf61239f9332a9cd91110a9b6319b1133ff3bd27.1596941624.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.676.v2.git.1596941624.gitgitgadget@gmail.com>
References: <pull.676.git.1595927632.gitgitgadget@gmail.com>
        <pull.676.v2.git.1596941624.gitgitgadget@gmail.com>
From: "Abhishek Kumar via GitGitGadget" <gitgitgadget@gmail.com>
Date: Sun, 09 Aug 2020 02:53:36 +0000
Subject: [PATCH v2 02/10] revision: parse parent in indegree_walk_step()
Fcc: Sent
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
To: git@vger.kernel.org
Cc: Derrick Stolee <stolee@gmail.com>,
 Jakub =?utf-8?b?TmFyxJlic2tp?= <jnareb@gmail.com>,
 Taylor Blau <me@ttaylor.com>, Abhishek Kumar <abhishekkumar8222@gmail.com>,
 Abhishek Kumar <abhishekkumar8222@gmail.com>
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

Implement Corrected Commit Date | expand

Commit Message

Linus Arver via GitGitGadget Aug. 9, 2020, 2:53 a.m. UTC

From: Abhishek Kumar <abhishekkumar8222@gmail.com>

In indegree_walk_step(), we add unvisited parents to the indegree queue.
However, parents are not guaranteed to be parsed. As the indegree queue
sorts by generation number, let's parse parents before inserting them to
ensure the correct priority order.

Signed-off-by: Abhishek Kumar <abhishekkumar8222@gmail.com>
---
 revision.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/revision.c b/revision.c
index 6de29cdf7a..4ec82ed5ab 100644
--- a/revision.c
+++ b/revision.c
@@ -3365,6 +3365,9 @@  static void indegree_walk_step(struct rev_info *revs)
 		struct commit *parent = p->item;
 		int *pi = indegree_slab_at(&info->indegree, parent);
 
+		if (parse_commit_gently(parent, 1) < 0)
+			return;
+
 		if (*pi)
 			(*pi)++;
 		else

[v2,02/10] revision: parse parent in indegree_walk_step()

Commit Message

Patch