diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-01-28 16:33:28 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-01-28 11:04:00 -0800 |
| commit | 752527f51396886c4ca11a14bfcecf2167ed4c40 (patch) | |
| tree | 45c47507226d46ebdca4778ac893a791c1e4ed02 | |
| parent | t9001: add missing && operators (diff) | |
| download | tgif-752527f51396886c4ca11a14bfcecf2167ed4c40.tar.xz | |
Add test for rebase -i with commits that do not pass pre-commit
This accompanies c5b09feb786f6a2456ec3d8203d0f4d67f09f043 (Avoid
update hook during git-rebase --interactive) to make sure that
any regression to make Debian's Bug#458782 (git-core: git-rebase
doesn't work when trying to squash changes into commits created
with --no-verify) resurface will be caught.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 74a7eb30f8..e33ea4e9f4 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -324,4 +324,20 @@ test_expect_success 'rebase a detached HEAD' ' test $grandparent = $(git rev-parse HEAD~2) ' +test_expect_success 'rebase a commit violating pre-commit' ' + + mkdir -p .git/hooks && + PRE_COMMIT=.git/hooks/pre-commit && + echo "#!/bin/sh" > $PRE_COMMIT && + echo "test -z \"\$(git diff --cached --check)\"" >> $PRE_COMMIT && + chmod a+x $PRE_COMMIT && + echo "monde! " >> file1 && + test_tick && + ! git commit -m doesnt-verify file1 && + git commit -m doesnt-verify --no-verify file1 && + test_tick && + FAKE_LINES=2 git rebase -i HEAD~2 + +' + test_done |