[PATCH 4/6] merge hook tests: fix and update tests
STALE3761d
From: Benoit Pierre <hidden>
Date: 2016-06-15 23:00:12
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v1 of 2 in this series.
Revisions (2)
- v1 current
- v2 [diff vs current]
- update 'no editor' hook test and add 'editor' hook test - reset tree at the beginning of failing hook tests to avoid failures due to an unclean tree after running a previous test Signed-off-by: Benoit Pierre <redacted> --- t/t7505-prepare-commit-msg-hook.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
index 3573751..ae7b2db 100755
--- a/t/t7505-prepare-commit-msg-hook.sh
+++ b/t/t7505-prepare-commit-msg-hook.sh@@ -141,7 +141,19 @@ test_expect_success 'with hook (merge)' ' git commit -m other && git checkout - && git merge other && - test "`git log -1 --pretty=format:%s`" = merge + test "`git log -1 --pretty=format:%s`" = "merge (no editor)" +' + +test_expect_success 'with hook and editor (merge)' ' + + head=`git rev-parse HEAD` && + git checkout -B other HEAD@{1} && + echo "more" >> file && + git add file && + git commit -m other && + git checkout - && + env GIT_EDITOR="\"\$FAKE_EDITOR\"" git merge -e other && + test "`git log -1 --pretty=format:%s`" = "merge" ' cat > "$HOOK" <<'EOF'
@@ -151,6 +163,7 @@ EOF test_expect_success 'with failing hook' ' + git reset --hard && head=`git rev-parse HEAD` && echo "more" >> file && git add file &&
@@ -160,6 +173,7 @@ test_expect_success 'with failing hook' ' test_expect_success 'with failing hook (--no-verify)' ' + git reset --hard && head=`git rev-parse HEAD` && echo "more" >> file && git add file &&
@@ -169,6 +183,7 @@ test_expect_success 'with failing hook (--no-verify)' ' test_expect_success 'with failing hook (merge)' ' + git reset --hard && git checkout -B other HEAD@{1} && echo "more" >> file && git add file &&
--
1.9.0