diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-17 13:57:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 13:57:58 -0800 |
| commit | 5a7a0fae8f964b5ad179018d6a50f25ef7550f97 (patch) | |
| tree | 126f1390f83cbddc7b67b70f25348b282944a772 /t | |
| parent | Merge branch 'maint' (diff) | |
| parent | clean: remove redundant variable baselen (diff) | |
| download | tgif-5a7a0fae8f964b5ad179018d6a50f25ef7550f97.tar.xz | |
Merge branch 'maint'
* maint:
clean: remove redundant variable baselen
Documentation/git-pull: clarify configuration
Document that rev-list --graph triggers parent rewriting.
clean: avoid quoting twice
document sigchain api
Keep together options controlling the behaviour of diffcore-rename.
t3402: test "rebase -s<strategy> -X<opt>"
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3402-rebase-merge.sh | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh index 2bea65634a..be8c1d5ef9 100755 --- a/t/t3402-rebase-merge.sh +++ b/t/t3402-rebase-merge.sh @@ -117,4 +117,25 @@ test_expect_success 'picking rebase' ' esac ' +test_expect_success 'rebase -s funny -Xopt' ' + test_when_finished "rm -fr test-bin funny.was.run" && + mkdir test-bin && + cat >test-bin/git-merge-funny <<-EOF && + #!$SHELL_PATH + case "\$1" in --opt) ;; *) exit 2 ;; esac + shift && + >funny.was.run && + exec git merge-recursive "\$@" + EOF + chmod +x test-bin/git-merge-funny && + git reset --hard && + git checkout -b test-funny master^ && + test_commit funny && + ( + PATH=./test-bin:$PATH + git rebase -s funny -Xopt master + ) && + test -f funny.was.run +' + test_done |