X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/850c3a89476ba8608b2deeba109fa7def2607655..2171eff37c64813683355542bd6e5947c7e53bcd:/t/t2600-coalesce.sh

diff --git a/t/t2600-coalesce.sh b/t/t2600-coalesce.sh
index ef5bf99..9a043fd 100755
--- a/t/t2600-coalesce.sh
+++ b/t/t2600-coalesce.sh
@@ -28,4 +28,17 @@ test_expect_success 'Coalesce at stack top' '
     [ "$(echo $(stg series --unapplied --noprefix))" = "" ]
 '
 
+cat > editor <<EOF
+#!/bin/sh
+echo "Editor was invoked" | tee editor-invoked
+EOF
+chmod a+x editor
+test_expect_success 'Coalesce with top != head' '
+    echo blahonga >> foo.txt &&
+    git commit -a -m "a new commit" &&
+    EDITOR=./editor command_error stg coalesce --name=r0 p0 q1 &&
+    test "$(echo $(stg series))" = "+ p0 > q1" &&
+    test ! -e editor-invoked
+'
+
 test_done