If rebase.autoStash configuration variable is
set, there is no way to override it for
"git pull --rebase" from the command line.
Teach "git pull --rebase" the --[no]autostash
command line flag which overrides the current
value of rebase.autostash, if set. As "git rebase"
understands the --[no]autostash option, it's
just a matter of passing the option to underlying
"git rebase" when "git pull --rebase" is called.
Helped-by: Matthieu Moy <matthieu....@grenoble-inp.fr>
Helped-by: Junio C Hamano <gits...@pobox.com>
Helped-by: Paul Tan <pyoka...@gmail.com>
Signed-off-by: Mehul Jain <mehul.jain2...@gmail.com>
---
Sorry for a late follow up. I had my mid-semester
examination going on.
Previous patch: $gname287709
Changes:
* error message is produced when "git pull
--[no]autostash" is called.
* opt_autostash intialized with -1.
builtin/pull.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 10eff03..b338b83 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -85,6 +85,7 @@ static char *opt_squash;
static char *opt_commit;
static char *opt_edit;
static char *opt_ff;
+static int opt_autostash = -1;
static char *opt_verify_signatures;
static struct argv_array opt_strategies = ARGV_ARRAY_INIT;
static struct argv_array opt_strategy_opts = ARGV_ARRAY_INIT;
@@ -146,6 +147,8 @@ static struct option pull_options[] = {
OPT_PASSTHRU(0, "ff-only", &opt_ff, NULL,
N_("abort if fast-forward is not possible"),
PARSE_OPT_NOARG | PARSE_OPT_NONEG),
+ OPT_BOOL(0, "autostash", &opt_autostash,
+ N_("automatically stash/stash pop before and after rebase")),
OPT_PASSTHRU(0, "verify-signatures", &opt_verify_signatures, NULL,
N_("verify that the named commit has a valid GPG signature"),
PARSE_OPT_NOARG),
@@ -789,7 +792,8 @@ static int run_rebase(const unsigned char *curr_head,
argv_array_pushv(&args, opt_strategy_opts.argv);
if (opt_gpg_sign)
argv_array_push(&args, opt_gpg_sign);
-
+ if (opt_autostash)
+ argv_array_push(&args, "--autostash");
argv_array_push(&args, "--onto");
argv_array_push(&args, sha1_to_hex(merge_head));
@@ -835,18 +839,25 @@ int cmd_pull(int argc, const char **argv, const char
*prefix)
hashclr(orig_head);
if (opt_rebase) {
- int autostash = 0;
-
if (is_null_sha1(orig_head) && !is_cache_unborn())
die(_("Updating an unborn branch with changes added to
the index."));
- git_config_get_bool("rebase.autostash", &autostash);
- if (!autostash)
+ if (opt_autostash == -1)
+ git_config_get_bool("rebase.autostash", &opt_autostash);
+
+ if (opt_autostash == 0 || opt_autostash == -1)
die_on_unclean_work_tree(prefix);
if (get_rebase_fork_point(rebase_fork_point, repo, *refspecs))
hashclr(rebase_fork_point);
}
+ else {
+ /* If --[no-]autostash option is called without --rebase */
+ if (opt_autostash == 0)
+ die(_("--no-autostash option is only valid with
--rebase."));
+ else if (opt_autostash == 1)
+ die(_("--autostash option is only valid with
--rebase."));
+ }
if (run_fetch(repo, refspecs))
return 1;
--
2.7.1.340.g69eb491.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
