At start of script, t3404 installs a specialized test-editor ($EDITOR)
upon which many of the interactive rebase tests depend.  Late in t3404,
test "rebase -i respects core.commentchar" installs its own custom
editor but neglects to restore the specialized editor when finished.
This oversight will cause later tests, which require the specialized
editor, to fail.  (There are no such tests presently, but a subsequent
patch will introduce one.)  Fix this problem.

Signed-off-by: Eric Sunshine <>
 t/ | 1 +
 1 file changed, 1 insertion(+)

diff --git a/t/ b/t/
index 49ccb38..af141be 100755
--- a/t/
+++ b/t/
@@ -949,6 +949,7 @@ test_expect_success 'rebase -i respects core.commentchar' '
        sed -e "2,\$s/^/\\\\/" "$1" >"$1.tmp" &&
        mv "$1.tmp" "$1"
+       test_when_finished "set_fake_editor" &&
        test_set_editor "$(pwd)/" &&
        git rebase -i B &&
        test B = $(git cat-file commit HEAD^ | sed -ne \$p)

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to