diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-02-05 09:42:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-05 09:42:28 -0800 |
| commit | 7a9ae6d0d9cf979a2b1a018135370dd6331e505c (patch) | |
| tree | fb90a763cce57ab47ce43d6157d41917eef56a1e /t | |
| parent | Sync with Git 2.35.1 (diff) | |
| parent | pull --rebase: honor rebase.autostash when fast-forwarding (diff) | |
| download | tgif-7a9ae6d0d9cf979a2b1a018135370dd6331e505c.tar.xz | |
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 't')
| -rwxr-xr-x | t/t5520-pull.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 93ecfcdd24..081808009b 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -330,6 +330,19 @@ test_expect_success '--rebase --autostash fast forward' ' test_cmp_rev HEAD to-rebase-ff ' +test_expect_success '--rebase with rebase.autostash succeeds on ff' ' + test_when_finished "rm -fr src dst actual" && + git init src && + test_commit -C src "initial" file "content" && + git clone src dst && + test_commit -C src --printf "more_content" file "more content\ncontent\n" && + echo "dirty" >>dst/file && + test_config -C dst rebase.autostash true && + git -C dst pull --rebase >actual 2>&1 && + grep -q "Fast-forward" actual && + grep -q "Applied autostash." actual +' + test_expect_success '--rebase with conflicts shows advice' ' test_when_finished "git rebase --abort; git checkout -f to-rebase" && git checkout -b seq && |