kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Kevin Daudt 2015-07-04 23:42:38 +02:00 committed by Junio C Hamano
parent b1456605c2
commit 53c76dc05e
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/pull.c
View File

@ -823,9 +823,13 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
hashclr(orig_head); hashclr(orig_head);


if (opt_rebase) { if (opt_rebase) {
int autostash = 0;

if (is_null_sha1(orig_head) && !is_cache_unborn()) if (is_null_sha1(orig_head) && !is_cache_unborn())
die(_("Updating an unborn branch with changes added to the index.")); die(_("Updating an unborn branch with changes added to the index."));


git_config_get_bool("rebase.autostash", &autostash);
if (!autostash)
die_on_unclean_work_tree(prefix); die_on_unclean_work_tree(prefix);


if (get_rebase_fork_point(rebase_fork_point, repo, *refspecs)) if (get_rebase_fork_point(rebase_fork_point, repo, *refspecs))

12
t/t5520-pull.sh
View File

@ -122,6 +122,18 @@ test_expect_success '--rebase' '
test $(git rev-parse HEAD^) = $(git rev-parse copy) && test $(git rev-parse HEAD^) = $(git rev-parse copy) &&
test new = $(git show HEAD:file2) test new = $(git show HEAD:file2)
' '

test_expect_success 'pull --rebase succeeds with dirty working directory and rebase.autostash set' '
test_config rebase.autostash true &&
git reset --hard before-rebase &&
echo dirty >new_file &&
git add new_file &&
git pull --rebase . copy &&
test_cmp_rev HEAD^ copy &&
test "$(cat new_file)" = dirty &&
test "$(cat file)" = "modified again"
'

test_expect_success 'pull.rebase' ' test_expect_success 'pull.rebase' '
git reset --hard before-rebase && git reset --hard before-rebase &&
test_config pull.rebase true && test_config pull.rebase true &&