summaryrefslogtreecommitdiff
path: root/builtin/pull.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-02-05 17:42:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-02-05 17:42:28 (GMT)
commit7a9ae6d0d9cf979a2b1a018135370dd6331e505c (patch)
treefb90a763cce57ab47ce43d6157d41917eef56a1e /builtin/pull.c
parent5d01301f2b865aa8dba1654d3f447ce9d21db0b5 (diff)
parent3013d98d7a09b42a111a355db286e72ee03b2e94 (diff)
downloadgit-7a9ae6d0d9cf979a2b1a018135370dd6331e505c.zip
git-7a9ae6d0d9cf979a2b1a018135370dd6331e505c.tar.gz
git-7a9ae6d0d9cf979a2b1a018135370dd6331e505c.tar.bz2
Merge branch 'pb/pull-rebase-autostash-fix'
"git pull --rebase" ignored the rebase.autostash configuration variable when the remote history is a descendant of our history, which has been corrected. * pb/pull-rebase-autostash-fix: pull --rebase: honor rebase.autostash when fast-forwarding
Diffstat (limited to 'builtin/pull.c')
-rw-r--r--builtin/pull.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index 100cbf9..8f37880 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -1038,14 +1038,13 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
oidclr(&orig_head);
if (opt_rebase) {
- int autostash = config_autostash;
- if (opt_autostash != -1)
- autostash = opt_autostash;
+ if (opt_autostash == -1)
+ opt_autostash = config_autostash;
if (is_null_oid(&orig_head) && !is_cache_unborn())
die(_("Updating an unborn branch with changes added to the index."));
- if (!autostash)
+ if (!opt_autostash)
require_clean_work_tree(the_repository,
N_("pull with rebase"),
_("please commit or stash them."), 1, 0);