diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:21 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:22 -0700 |
commit | 6560584494a8053431d0c8e90b78d50f71c8055b (patch) | |
tree | 58b98a1dfccd4cce516f15effaa77652cfe7dc05 /t | |
parent | Merge branch 'jk/make-findstring-makeflags-fix' (diff) | |
parent | Documentation/git-rebase: fix --no-autostash formatting (diff) | |
download | tgif-6560584494a8053431d0c8e90b78d50f71c8055b.tar.xz |
Merge branch 'jk/rebase-no-autostash'
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 && |