diff options
| author | Ryan Biesemeyer <ryan@yaauie.com> | 2014-01-09 00:45:42 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-10 15:40:59 -0800 |
| commit | 77742c95834b5fca053bdf7509321b738888bd97 (patch) | |
| tree | 8c7e6c29a3ebe1d78a591b8320b06c168d2af520 | |
| parent | a32dedbf60f5e144b9f5d1ca8621722b918aabb9 (diff) | |
| download | git-77742c95834b5fca053bdf7509321b738888bd97.tar.gz | |
t7505: ensure cleanup after hook blocks merge
Signed-off-by: Ryan Biesemeyer <ryan@yaauie.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t7505-prepare-commit-msg-hook.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh index 1c95652dce..bf14224261 100755 --- a/t/t7505-prepare-commit-msg-hook.sh +++ b/t/t7505-prepare-commit-msg-hook.sh @@ -168,9 +168,10 @@ test_expect_success 'with failing hook (--no-verify)' ' ' test_expect_success 'with failing hook (merge)' ' + test_when_finished "git merge --abort" && git checkout -B other HEAD@{1} && - echo "more" >> file && + echo "more" >>file && git add file && rm -f "$HOOK" && git commit -m other && @@ -179,7 +180,6 @@ test_expect_success 'with failing hook (merge)' ' EOF git checkout - && test_must_fail git merge other - ' test_done |