difftool: fallback on merge.guitool

diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 1a6773ee6889939a0046664bd8a7cdcc4f21fe01..f1349af56edd17483120a1e177c70282759778d3 100755 (executable)
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -99,12 +99,12 @@ test_expect_success '--dry-run with stuff to commit returns ok' '
        git commit -m next -a --dry-run
 '
 
-test_expect_failure '--short with stuff to commit returns ok' '
+test_expect_success '--short with stuff to commit returns ok' '
        echo bongo bongo bongo >>file &&
        git commit -m next -a --short
 '
 
-test_expect_failure '--porcelain with stuff to commit returns ok' '
+test_expect_success '--porcelain with stuff to commit returns ok' '
        echo bongo bongo bongo >>file &&
        git commit -m next -a --porcelain
 '
@@ -698,4 +698,10 @@ test_expect_success '--dry-run with conflicts fixed from a merge' '
        git commit -m "conflicts fixed from merge."
 '
 
+test_expect_success '--dry-run --short' '
+       >test-file &&
+       git add test-file &&
+       git commit --dry-run --short
+'
+
 test_done