diff options
| author | Elijah Newren <newren@gmail.com> | 2018-02-14 18:52:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 22:11:58 (GMT) |
| commit | e0052f4613cd8f586b0b9975fedffce268ca6ce9 (patch) | |
| tree | 22e8c50f49c9850239e195cb4ae5a877f8bd0bd1 /unpack-trees.c | |
| parent | 7b3d3b06811c3d603d47d50eb3c8775571845a80 (diff) | |
| download | git-e0052f4613cd8f586b0b9975fedffce268ca6ce9.zip git-e0052f4613cd8f586b0b9975fedffce268ca6ce9.tar.gz git-e0052f4613cd8f586b0b9975fedffce268ca6ce9.tar.bz2 | |
merge-recursive: fix overwriting dirty files involved in renames
This fixes an issue that existed before my directory rename detection
patches that affects both normal renames and renames implied by
directory rename detection. Additional codepaths that only affect
overwriting of dirty files that are involved in directory rename
detection will be added in a subsequent commit.
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@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 bf8b602..5b922c1 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1486,8 +1486,8 @@ static int verify_uptodate_1(const struct cache_entry *ce, add_rejected_path(o, error_type, ce->name); } -static int verify_uptodate(const struct cache_entry *ce, - struct unpack_trees_options *o) +int verify_uptodate(const struct cache_entry *ce, + struct unpack_trees_options *o) { if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE)) return 0; |