diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2009-08-20 20:47:02 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-23 17:13:33 -0700 |
| commit | 32f54ca31747c47f56abb7ae87a6da0f5b8d97c3 (patch) | |
| tree | 1cdcb7ffe0bc59df1f236f0e7dec5bfc9fee7ee2 /unpack-trees.c | |
| parent | c28b3d6e7b0471a02f81324a90b26effae0f4bde (diff) | |
| download | git-32f54ca31747c47f56abb7ae87a6da0f5b8d97c3.tar.gz git-32f54ca31747c47f56abb7ae87a6da0f5b8d97c3.tar.xz | |
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>
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 3eda26359..dc6d74a16 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); } } |