Commit Diff

Commit:
6c13b00592a6253b4a4de885b1f595e141b65281
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
Update comment regarding the merged_paths list used by rebase and histedit with insight I obtained while trying to make this idea work, and failing...
Actions:
Patch | Tree
commit - dae2a678dfc5685c0f121fd205f62439f417dcc5
commit + 6c13b00592a6253b4a4de885b1f595e141b65281
blob - 9dcec45509bd829020e987bf5dec3635512ee62f
blob + d6df04c0f3df601231396b5ce85997edcd0224a8
--- lib/worktree.c
+++ lib/worktree.c
@@ -6359,8 +6359,13 @@ rebase_commit(struct got_object_id **new_commit_id,
 	/*
 	 * If possible get the status of individual files directly to
 	 * avoid crawling the entire work tree once per rebased commit.
-	 * TODO: Ideally, merged_paths would contain a list of commitables
+	 *
+	 * Ideally, merged_paths would contain a list of commitables
 	 * we could use so we could skip worktree_status() entirely.
+	 * However, we would then need carefully keep track of cumulative
+	 * effects of operations such as file additions and deletions
+	 * in 'got histedit -f' (folding multiple commits into one),
+	 * and this extra complexity is not really worth it.
 	 */
 	if (merged_paths) {
 		struct got_pathlist_entry *pe;