From: Paul Tan <pyokagan@gmail.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Stephen Robin <stephen.robin@gmail.com>,
Paul Tan <pyokagan@gmail.com>
Subject: [PATCH v4 16/19] pull: configure --rebase via branch.<name>.rebase or pull.rebase
Date: Thu, 18 Jun 2015 18:54:09 +0800 [thread overview]
Message-ID: <1434624852-6869-17-git-send-email-pyokagan@gmail.com> (raw)
In-Reply-To: <1434624852-6869-1-git-send-email-pyokagan@gmail.com>
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>
---
Notes:
v4
* Fixed the use-after-free. Thanks Duy for catching it.
builtin/pull.c | 35 ++++++++++++++++++++++++++++++++++-
1 file changed, 34 insertions(+), 1 deletion(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 33a7b98..1c4fb44 100644
--- 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 enum rebase_type opt_rebase;
+static enum rebase_type opt_rebase = -1;
static char *opt_diffstat;
static char *opt_log;
static char *opt_squash;
@@ -266,6 +266,36 @@ static const char *config_get_ff(void)
}
/**
+ * 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.
*/
@@ -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_rebase < 0)
+ opt_rebase = config_get_rebase();
+
git_config(git_default_config, NULL);
if (read_cache_unmerged())
--
2.1.4
next prev parent reply other threads:[~2015-06-18 11:08 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-18 10:53 [PATCH v4 00/19] Make git-pull a builtin Paul Tan
2015-06-18 10:53 ` [PATCH v4 01/19] parse-options-cb: implement parse_opt_passthru() Paul Tan
2015-06-18 10:53 ` [PATCH v4 02/19] parse-options-cb: implement parse_opt_passthru_argv() Paul Tan
2015-06-18 10:53 ` [PATCH v4 03/19] argv-array: implement argv_array_pushv() Paul Tan
2015-06-18 10:53 ` [PATCH v4 04/19] pull: implement skeletal builtin pull Paul Tan
2015-06-18 10:53 ` [PATCH v4 05/19] pull: implement fetch + merge Paul Tan
2015-06-18 10:53 ` [PATCH v4 06/19] pull: pass verbosity, --progress flags to fetch and merge Paul Tan
2015-06-18 10:54 ` [PATCH v4 07/19] pull: pass git-merge's options to git-merge Paul Tan
2015-06-18 10:54 ` [PATCH v4 08/19] pull: pass git-fetch's options to git-fetch Paul Tan
2015-06-18 10:54 ` [PATCH v4 09/19] pull: error on no merge candidates Paul Tan
2015-06-18 10:54 ` [PATCH v4 10/19] pull: support pull.ff config Paul Tan
2015-06-18 10:54 ` [PATCH v4 11/19] pull: check if in unresolved merge state Paul Tan
2015-06-18 10:54 ` [PATCH v4 12/19] pull: fast-forward working tree if head is updated Paul Tan
2015-06-18 10:54 ` [PATCH v4 13/19] pull: implement pulling into an unborn branch Paul Tan
2015-06-18 10:54 ` [PATCH v4 14/19] pull: set reflog message Paul Tan
2015-06-18 10:54 ` [PATCH v4 15/19] pull: teach git pull about --rebase Paul Tan
2015-06-18 10:54 ` Paul Tan [this message]
2015-06-18 10:54 ` [PATCH v4 17/19] pull --rebase: exit early when the working directory is dirty Paul Tan
2015-06-18 10:54 ` [PATCH v4 18/19] pull --rebase: error on no merge candidate cases Paul Tan
2015-06-18 10:54 ` [PATCH v4 19/19] pull: remove redirection to git-pull.sh Paul Tan
2015-06-18 20:13 ` [PATCH v4 00/19] Make git-pull a builtin Junio C Hamano
2015-06-19 10:11 ` Paul Tan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1434624852-6869-17-git-send-email-pyokagan@gmail.com \
--to=pyokagan@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=sbeller@google.com \
--cc=stephen.robin@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).