git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 2/5] unpack-trees: remove unneeded continue

From
Stefan Beller <sbeller@google.com>
Date
Jan 6, 2017, 21:03 UTC
Message-ID
<20170106210330.31761-3-sbeller@google.com>
In-Reply-To
<20170106210330.31761-1-sbeller@google.com>

The continue is the last statement in the loop, so not needed. This situation arose in 700e66d66 (2010-07-30, unpack-trees: let read-tree -u remove index entries outside sparse area) when statements after the continue were removed.

Signed-off-by: Stefan Beller <sbeller@google.com>
---
 unpack-trees.c | 1 -
 1 file changed, 1 deletion(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 55c75b4d6a..f16ef14294 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -272,31 +272,30 @@ static int check_updates(struct unpack_trees_options *o)
 
 		progress = start_progress_delay(_("Checking out files"),
 						total, 50, 1);
 		cnt = 0;
 	}
 
 	if (o->update)
 		git_attr_set_direction(GIT_ATTR_CHECKOUT, index);
 	for (i = 0; i < index->cache_nr; i++) {
 		const struct cache_entry *ce = index->cache[i];
 
 		if (ce->ce_flags & CE_WT_REMOVE) {
 			display_progress(progress, ++cnt);
 			if (o->update && !o->dry_run)
 				unlink_entry(ce);
-			continue;
 		}
 	}
 	remove_marked_cache_entries(index);
 	remove_scheduled_dirs();
 
 	for (i = 0; i < index->cache_nr; i++) {
 		struct cache_entry *ce = index->cache[i];
 
 		if (ce->ce_flags & CE_UPDATE) {
 			if (ce->ce_flags & CE_WT_REMOVE)
 				die("BUG: both update and delete flags are set on %s",
 				    ce->name);
 			display_progress(progress, ++cnt);
 			ce->ce_flags &= ~CE_UPDATE;
 			if (o->update && !o->dry_run) {
-- 
2.11.0.31.g919a8d0.dirty
Previous: Stefan Beller
Message 9 of 9 in “Re: [PATCHv2] unpack-trees: move checkout state into check_updates”
  1. Stefan BellerJan 6, 2017
  2. 0/5 refactor unpack-treesStefan Beller, Jan 6, 2017
  3. 1/5 unpack-trees: move checkout state into check_updatesStefan Beller, Jan 6, 2017
  4. 5/5 unpack-trees: factor working tree update out of check_updatesStefan Beller, Jan 6, 2017
  5. 4/5 unpack-trees: factor file removal out of check_updatesStefan Beller, Jan 6, 2017
  6. Jeff KingJan 7, 2017
  7. Stefan BellerJan 9, 2017
  8. 3/5 unpack-trees: factor progress setup out of check_updatesStefan Beller, Jan 6, 2017
  9. 2/5 unpack-trees: remove unneeded continueStefan Beller, Jan 6, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.