From: Nguyễn Thái Ngọc Duy Date: Mon, 14 Dec 2009 10:30:55 GMT Subject: [PATCH 12/23] unpack-trees(): carry skip-worktree bit over in merged_entry() Message-ID: <1260786666-8405-13-git-send-email-pclouds@gmail.com> In-Reply-To: <1260786666-8405-1-git-send-email-pclouds@gmail.com> In this code path, we would remove "old" and replace it with "merge". "old" may have skip-worktree bit, so re-add it to "merge". Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- unpack-trees.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index 1ab3c89..ac59fbe 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -680,6 +680,8 @@ static int merged_entry(struct cache_entry *merge, struct cache_entry *old, } else { if (verify_uptodate(old, o)) return -1; + if (ce_skip_worktree(old)) + update |= CE_SKIP_WORKTREE; invalidate_ce_path(old, o); } } -- 1.6.5.2.216.g9c1ec