diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-20 03:05:58 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-20 03:05:58 +0400 |
| commit | ce6e5ff435f325769dd28980cf3c8b1625f194f2 (patch) | |
| tree | a903e06ed0f4cfb9fb1f8f484907baa57b7d2b0a /t | |
| parent | 3aa615bc5d5348d732b5b1354cc3517a55b34a6f (diff) | |
| parent | fd631d5828ec6b89e86e0568e5e798787fed9bbd (diff) | |
Merge branch 'ns/rebase-noverify'
* ns/rebase-noverify:
rebase: Document --no-verify option to bypass pre-rebase hook
rebase --no-verify
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3409-rebase-hook.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t3409-rebase-hook.sh b/t/t3409-rebase-hook.sh index bc93dda8fd..1f1b850677 100755 --- a/t/t3409-rebase-hook.sh +++ b/t/t3409-rebase-hook.sh @@ -123,4 +123,20 @@ test_expect_success 'pre-rebase hook stops rebase (2)' ' test 0 = $(git rev-list HEAD...side | wc -l) ' +test_expect_success 'rebase --no-verify overrides pre-rebase (1)' ' + git checkout test && + git reset --hard side && + git rebase --no-verify master && + test "z$(git symbolic-ref HEAD)" = zrefs/heads/test && + test "z$(cat git)" = zworld +' + +test_expect_success 'rebase --no-verify overrides pre-rebase (2)' ' + git checkout test && + git reset --hard side && + EDITOR=true git rebase --no-verify -i master && + test "z$(git symbolic-ref HEAD)" = zrefs/heads/test && + test "z$(cat git)" = zworld +' + test_done |