diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-12-08 14:05:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-08 14:05:01 -0800 |
| commit | 697bd2871cd04357ced89b962d39eb685dab47ca (patch) | |
| tree | 05a5149048de941a465151fa6e4488b65a319f4e /t | |
| parent | 9a8c740225bbd551d85a353a7bd33d57aafaca06 (diff) | |
| parent | 82e0668cde032379095b0581609c73646e9eb92a (diff) | |
| download | git-697bd2871cd04357ced89b962d39eb685dab47ca.tar.gz | |
Merge branch 'jk/rebase-no-autostash' into maint
There was no way to defeat a configured rebase.autostash variable
from the command line, as "git rebase --no-autostash" was missing.
* jk/rebase-no-autostash:
Documentation/git-rebase: fix --no-autostash formatting
rebase: support --no-autostash
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3420-rebase-autostash.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index d783f03d3f..944154b2e0 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.sh @@ -37,6 +37,16 @@ testrebase() { type=$1 dotest=$2 + test_expect_success "rebase$type: dirty worktree, --no-autostash" ' + test_config rebase.autostash true && + git reset --hard && + git checkout -b rebased-feature-branch feature-branch && + test_when_finished git branch -D rebased-feature-branch && + test_when_finished git checkout feature-branch && + echo dirty >>file3 && + test_must_fail git rebase$type --no-autostash unrelated-onto-branch + ' + test_expect_success "rebase$type: dirty worktree, non-conflicting rebase" ' test_config rebase.autostash true && git reset --hard && |