Revert "builtin-commit.c: remove useless check added by faulty cut and paste"
This reverts commit 16335fdd7ace78a8285ba25fd7a81177a48e7c9b. We are calling overlay_tree_on_cache() which does use CE_UPDATE flag to mark duplicated entries, which is the same as the codepath in git-ls-files with its --with-tree option. Because the pathname ce->name is given to path_list_insert() which does not allow duplicates, there is no breakage either way from the correctness point of view in this codepath, unlike the one in ls-files. But avoiding unnecessary processing with a single bit check is certainly better.
Junio C Hamano committed
Jan 14, 2008 at 13:54 UTC
e87e22d0f22eb262a90e76197465d6cfd9707ea1
1 file changed
+2
builtin-commit.c
+2
@@ -156,6 +156,8 @@ static int list_paths(struct path_list *list, const char *with_tree,
156
157
for (i = 0; i < active_nr; i++) {
158
struct cache_entry *ce = active_cache[i];
159
+ if (ce->ce_flags & htons(CE_UPDATE))
160
+ continue;
161
if (!pathspec_match(pattern, m, ce->name, 0))
162
continue;
163
path_list_insert(ce->name, list);