xdl_merge(): fix a segmentation fault when refining conflicts

[git.git] / builtin-rerere.c

diff --git a/builtin-rerere.c b/builtin-rerere.c
index d064bd8bf0218feb7d4ad01b39be6a143757499e..7442498deedfef1f6be9e550f3c0259aaa82e0ba 100644 (file)
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -362,6 +362,17 @@ tail_optimization:
        return write_rr(rr, fd);
 }
 
+static int git_rerere_config(const char *var, const char *value)
+{
+       if (!strcmp(var, "gc.rerereresolved"))
+               cutoff_resolve = git_config_int(var, value);
+       else if (!strcmp(var, "gc.rerereunresolved"))
+               cutoff_noresolve = git_config_int(var, value);
+       else
+               return git_default_config(var, value);
+       return 0;
+}
+
 int cmd_rerere(int argc, const char **argv, const char *prefix)
 {
        struct path_list merge_rr = { NULL, 0, 0, 1 };
@@ -371,6 +382,8 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
        if (stat(git_path("rr-cache"), &st) || !S_ISDIR(st.st_mode))
                return 0;
 
+       git_config(git_rerere_config);
+
        merge_rr_path = xstrdup(git_path("rr-cache/MERGE_RR"));
        fd = hold_lock_file_for_update(&write_lock, merge_rr_path, 1);
        read_rr(&merge_rr);