Quoting Junio C Hamano <gitster@xxxxxxxxx>:
> When I did 2888605c649ccd423232161186d72c0e6c458a48
> (builtin-commit: fix partial-commit support), I mindlessly cut
> and pasted from builtin-ls-files.c, and included the part that
> was meant to exclude redundant path after "ls-files --with-tree"
> overlayed the HEAD commit on top of the index. This logic does
> not apply to what git-commit does and should not have been
> copied, even though it would not hurt.
>
> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
> ---
> builtin-commit.c | 2 --
> 1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/builtin-commit.c b/builtin-commit.c
> index 6d2ca80..265ba6b 100644
> --- a/builtin-commit.c
> +++ b/builtin-commit.c
> @@ -156,8 +156,6 @@ 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);
I think I may be wrong, but is this change really correct?
You are calling overlay_tree_on_cache() which does use CE_UPDATE flag to mark
duplicate entries. And that is the same algorithm as used when git-ls-files
is called with its --with-tree option. I think this if statement is not
mindless but is the right thing to have the same logic as you have in
git-ls-files.
--
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/
----------------------------------------------------------------------
Finally - A spam blocker that actually works.
http://www.bluebottle.com/tag/4
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
