cherry-pick: demonstrate a segmentation fault

diff --git a/merge-recursive.c b/merge-recursive.c
index 7bff5be164ef0c853818754d8e1882aac23ac6b1..de37e5153c791cb51fc77974edc30d0c44daf4d7 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -202,12 +202,21 @@ static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
                const char *path, int stage, int refresh, int options)
 {
        struct cache_entry *ce;
-       ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage,
-                             (refresh ? (CE_MATCH_REFRESH |
-                                         CE_MATCH_IGNORE_MISSING) : 0 ));
+       int ret;
+
+       ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, 0);
        if (!ce)
                return error(_("addinfo_cache failed for path '%s'"), path);
-       return add_cache_entry(ce, options);
+
+       ret = add_cache_entry(ce, options);
+       if (refresh) {
+               struct cache_entry *nce;
+
+               nce = refresh_cache_entry(ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING);
+               if (nce != ce)
+                       ret = add_cache_entry(nce, options);
+       }
+       return ret;
 }
 
 static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
@@ -2094,8 +2103,10 @@ int parse_merge_opt(struct merge_options *o, const char *s)
                o->renormalize = 0;
        else if (!strcmp(s, "no-renames"))
                o->detect_rename = 0;
-       else if (!strcmp(s, "find-renames"))
+       else if (!strcmp(s, "find-renames")) {
                o->detect_rename = 1;
+               o->rename_score = 0;
+       }
        else if (skip_prefix(s, "find-renames=", &arg) ||
                 skip_prefix(s, "rename-threshold=", &arg)) {
                if ((o->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0)