mirror of
https://github.com/git/git.git
synced 2024-10-28 12:59:41 +01:00
unpack-trees(): carry skip-worktree bit over in merged_entry()
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 <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
c28b3d6e7b
commit
32f54ca317
1 changed files with 2 additions and 0 deletions
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue