diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-01-14 13:54:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-14 13:54:24 -0800 |
| commit | e87e22d0f22eb262a90e76197465d6cfd9707ea1 (patch) | |
| tree | 1803e67ec3c5e8bfcfdd59e97bcb982d43e6d518 /builtin-commit.c | |
| parent | c60b528225d2827fd43d4fe4b082e0188df7a280 (diff) | |
| download | git-e87e22d0f22eb262a90e76197465d6cfd9707ea1.tar.gz git-e87e22d0f22eb262a90e76197465d6cfd9707ea1.tar.xz | |
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.
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index 265ba6bcd..6d2ca808b 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -156,6 +156,8 @@ static int list_paths(struct path_list *list, const char *with_tree, for (i = 0; i < active_nr; i++) { struct cache_entry *ce = active_cache[i]; + if (ce->ce_flags & htons(CE_UPDATE)) + continue; if (!pathspec_match(pattern, m, ce->name, 0)) continue; path_list_insert(ce->name, list); |