diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2009-08-20 20:46:59 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-23 17:13:32 -0700 |
| commit | 52030836943c0d28d8be4202762ede28e921dc21 (patch) | |
| tree | 08f16650e16cd347d2f8e15c0796556859750c38 /unpack-trees.c | |
| parent | b4d1690df11ae6ce382b93778616b1a20f1774ff (diff) | |
| download | git-52030836943c0d28d8be4202762ede28e921dc21.tar.gz | |
Teach Git to respect skip-worktree bit (writing part)
This part is mainly to remove CE_VALID shortcuts (and as a
consequence, ce_uptodate() shortcuts as it may be turned on by
CE_VALID) in writing code path if skip-worktree is used. Various tests
are added to avoid future breakages.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 720f7a1616..3eda263590 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -450,7 +450,7 @@ static int verify_uptodate(struct cache_entry *ce, { struct stat st; - if (o->index_only || o->reset || ce_uptodate(ce)) + if (o->index_only || (!ce_skip_worktree(ce) && (o->reset || ce_uptodate(ce)))) return 0; if (!lstat(ce->name, &st)) { @@ -1004,7 +1004,7 @@ int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o) if (old && same(old, a)) { int update = 0; - if (o->reset && !ce_uptodate(old)) { + if (o->reset && !ce_uptodate(old) && !ce_skip_worktree(old)) { struct stat st; if (lstat(old->name, &st) || ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID)) |