format-patch: introduce format.useAutoBase configuration

diff --git a/builtin/log.c b/builtin/log.c
index 9033bc7c54619bd6c59521b8f39f30e6b2333887..acfcc05b77d56e84f176d8be8d79984a66a93255 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -696,6 +696,7 @@ static void add_header(const char *value)
 #define THREAD_DEEP 2
 static int thread;
 static int do_signoff;
+static int base_auto;
 static const char *signature = git_version_string;
 static const char *signature_file;
 static int config_cover_letter;
@@ -780,6 +781,10 @@ static int git_format_config(const char *var, const char *value, void *cb)
        }
        if (!strcmp(var, "format.outputdirectory"))
                return git_config_string(&config_output_directory, var, value);
+       if (!strcmp(var, "format.useautobase")) {
+               base_auto = git_config_bool(var, value);
+               return 0;
+       }
 
        return git_log_config(var, value, cb);
 }
@@ -1199,7 +1204,11 @@ static struct commit *get_base_commit(const char *base_commit,
        struct commit **rev;
        int i = 0, rev_nr = 0;
 
-       if (!strcmp(base_commit, "auto")) {
+       if (base_commit && strcmp(base_commit, "auto")) {
+               base = lookup_commit_reference_by_name(base_commit);
+               if (!base)
+                       die(_("Unknown commit %s"), base_commit);
+       } else if ((base_commit && !strcmp(base_commit, "auto")) || base_auto) {
                struct branch *curr_branch = branch_get(NULL);
                const char *upstream = branch_get_upstream(curr_branch, NULL);
                if (upstream) {
@@ -1221,10 +1230,6 @@ static struct commit *get_base_commit(const char *base_commit,
                              "please use git branch --set-upstream-to to track a remote branch.\n"
                              "Or you could specify base commit by --base=<base-commit-id> manually."));
                }
-       } else {
-               base = lookup_commit_reference_by_name(base_commit);
-               if (!base)
-                       die(_("Unknown commit %s"), base_commit);
        }
 
        ALLOC_ARRAY(rev, total);
@@ -1662,7 +1667,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
        }
 
        memset(&bases, 0, sizeof(bases));
-       if (base_commit) {
+       if (base_commit || base_auto) {
                struct commit *base = get_base_commit(base_commit, list, nr);
                reset_revision_walk();
                prepare_bases(&bases, base, list, nr);