subtree test: add missing && to &&-chain

[thirdparty/git.git] / merge-recursive.h

diff --git a/merge-recursive.h b/merge-recursive.h
index d863cf88676ef321aad85d395f964efe5673a805..fa7bc6b6836f99ab9c417e2865cd5a544488d025 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -18,7 +18,8 @@ struct merge_options {
        unsigned renormalize : 1;
        long xdl_opts;
        int verbosity;
-       int detect_rename;
+       int diff_detect_rename;
+       int merge_detect_rename;
        int diff_rename_limit;
        int merge_rename_limit;
        int rename_score;
@@ -29,6 +30,7 @@ struct merge_options {
        struct hashmap current_file_dir_set;
        struct string_list df_conflict_file_set;
        struct unpack_trees_options unpack_opts;
+       struct index_state orig_index;
 };
 
 /*
@@ -56,6 +58,12 @@ struct collision_entry {
        unsigned reported_already:1;
 };
 
+static inline int merge_detect_rename(struct merge_options *o)
+{
+       return o->merge_detect_rename >= 0 ? o->merge_detect_rename :
+               o->diff_detect_rename >= 0 ? o->diff_detect_rename : 1;
+}
+
 /* merge_trees() but with recursive ancestor consolidation */
 int merge_recursive(struct merge_options *o,
                    struct commit *h1,