summaryrefslogtreecommitdiff
path: root/unpack-trees.h
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2018-02-14 18:52:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-27 22:11:58 (GMT)
commite0052f4613cd8f586b0b9975fedffce268ca6ce9 (patch)
tree22e8c50f49c9850239e195cb4ae5a877f8bd0bd1 /unpack-trees.h
parent7b3d3b06811c3d603d47d50eb3c8775571845a80 (diff)
downloadgit-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.h')
-rw-r--r--unpack-trees.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h
index 6c48117..41178ad 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -1,6 +1,7 @@
#ifndef UNPACK_TREES_H
#define UNPACK_TREES_H
+#include "tree-walk.h"
#include "string-list.h"
#define MAX_UNPACK_TREES 8
@@ -78,6 +79,9 @@ struct unpack_trees_options {
extern int unpack_trees(unsigned n, struct tree_desc *t,
struct unpack_trees_options *options);
+int verify_uptodate(const struct cache_entry *ce,
+ struct unpack_trees_options *o);
+
int threeway_merge(const struct cache_entry * const *stages,
struct unpack_trees_options *o);
int twoway_merge(const struct cache_entry * const *src,