tests/remote-containers.sh: clearer fast-forward warning

Project31 · Mar 26, 2019 · 985b2b0 · 985b2b0
1 parent 625483f
commit 985b2b0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/tests/remote-containers.sh b/tests/remote-containers.sh
@@ -28,7 +28,8 @@ analyse_commits ()
     # TODO: If we wanted to test "after PR merge", this needs to take some
     # argument specifying how long we should look in the commit history.
     git merge-base --is-ancestor "$MERGE_INTO" HEAD \
-        || die "Can not be --ff merged into $MERGE_INTO"
+        || die "Please rebase the commit '$(git rev-parse --short HEAD)'" \
+               "to allow --ff merge into '$MERGE_INTO' branch"
 
     while read line; do
         case $line in