summaryrefslogtreecommitdiff
path: root/builtin/pull.c
diff options
context:
space:
mode:
authorKevin Daudt <me@ikke.info>2015-07-04 21:42:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-07-22 19:56:30 (GMT)
commit53c76dc05e0b5ad5b1f92db9577694e896d67a0a (patch)
tree8b1fc77a72ae6d47d66838d83abd641d3b6c481e /builtin/pull.c
parentb1456605c26eb6bd991b70b0ca0a3ce0f02473e9 (diff)
downloadgit-53c76dc05e0b5ad5b1f92db9577694e896d67a0a.zip
git-53c76dc05e0b5ad5b1f92db9577694e896d67a0a.tar.gz
git-53c76dc05e0b5ad5b1f92db9577694e896d67a0a.tar.bz2
pull: allow dirty tree when rebase.autostash enabled
rebase learned to stash changes when it encounters a dirty work tree, but git pull --rebase does not. Only verify if the working tree is dirty when rebase.autostash is not enabled. Signed-off-by: Kevin Daudt <me@ikke.info> Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pull.c')
-rw-r--r--builtin/pull.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index 722a83c..b7bc1ff 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -823,10 +823,14 @@ 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."));
- die_on_unclean_work_tree(prefix);
+ git_config_get_bool("rebase.autostash", &autostash);
+ if (!autostash)
+ die_on_unclean_work_tree(prefix);
if (get_rebase_fork_point(rebase_fork_point, repo, *refspecs))
hashclr(rebase_fork_point);