pull: configure --rebase via branch.<name>.rebase or pull.rebase

Since cd67e4d (Teach 'git pull' about --rebase, 2007-11-28),
fetch+rebase could be set by default by defining the config variable
branch.<name>.rebase. This setting can be overriden on the command line
by --rebase and --no-rebase.

Since 6b37dff (pull: introduce a pull.rebase option to enable --rebase,
2011-11-06), git-pull --rebase can also be configured via the
pull.rebase configuration option.

Re-implement support for these two configuration settings by introducing
config_get_rebase() which is called before parse_options() to set the
default value of opt_rebase.

Helped-by: Stefan Beller <sbeller@google.com>
Helped-by: Duy Nguyen <pclouds@gmail.com>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/pull.c b/builtin/pull.c
index 33a7b984eb9bf7db60d7ca5fb991386847ba4be5..1c4fb443a8109ae3e1af1f268e28b5cb27057b95 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -72,7 +72,7 @@ static int opt_verbosity;
 static char *opt_progress;
 
 /* Options passed to git-merge or git-rebase */
 static char *opt_progress;
 
 /* Options passed to git-merge or git-rebase */

-static enum rebase_type opt_rebase;
+static enum rebase_type opt_rebase = -1;

 static char *opt_diffstat;
 static char *opt_log;
 static char *opt_squash;
 static char *opt_diffstat;
 static char *opt_log;
 static char *opt_squash;


@@ -265,6 +265,36 @@ static const char *config_get_ff(void)
        die(_("Invalid value for pull.ff: %s"), value);
 }
 
        die(_("Invalid value for pull.ff: %s"), value);
 }
 

+/**
+ * Returns the default configured value for --rebase. It first looks for the
+ * value of "branch.$curr_branch.rebase", where $curr_branch is the current
+ * branch, and if HEAD is detached or the configuration key does not exist,
+ * looks for the value of "pull.rebase". If both configuration keys do not
+ * exist, returns REBASE_FALSE.
+ */
+static enum rebase_type config_get_rebase(void)
+{
+       struct branch *curr_branch = branch_get("HEAD");
+       const char *value;
+
+       if (curr_branch) {
+               char *key = xstrfmt("branch.%s.rebase", curr_branch->name);
+
+               if (!git_config_get_value(key, &value)) {
+                       enum rebase_type ret = parse_config_rebase(key, value, 1);
+                       free(key);
+                       return ret;
+               }
+
+               free(key);
+       }
+
+       if (!git_config_get_value("pull.rebase", &value))
+               return parse_config_rebase("pull.rebase", value, 1);
+
+       return REBASE_FALSE;
+}
+

 /**
  * Appends merge candidates from FETCH_HEAD that are not marked not-for-merge
  * into merge_heads.
 /**
  * Appends merge candidates from FETCH_HEAD that are not marked not-for-merge
  * into merge_heads.


@@ -707,6 +737,9 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
        if (!opt_ff)
                opt_ff = xstrdup_or_null(config_get_ff());
 
        if (!opt_ff)
                opt_ff = xstrdup_or_null(config_get_ff());
 

+       if (opt_rebase < 0)
+               opt_rebase = config_get_rebase();
+

        git_config(git_default_config, NULL);
 
        if (read_cache_unmerged())
        git_config(git_default_config, NULL);
 
        if (read_cache_unmerged())