X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft1300-repo-config.sh;h=11b82f43dd0220c736dd269b2f6531a1381edf3a;hb=f1c8a48a2de69bfc9837c53f2c52ffbe7239dc3e;hp=64567fb94d5c3f9587b643333212cdb37a4661ac;hpb=57b0fc4516249e1aa86169718d148fbf2940dc0c;p=git.git

diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 64567fb94..11b82f43d 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -741,4 +741,14 @@ test_expect_success 'symlinked configuration' '
 
 '
 
+test_expect_success 'check split_cmdline return' "
+	git config alias.split-cmdline-fix 'echo \"' &&
+	test_must_fail git split-cmdline-fix &&
+	echo foo > foo &&
+	git add foo &&
+	git commit -m 'initial commit' &&
+	git config branch.master.mergeoptions 'echo \"' &&
+	test_must_fail git merge master
+	"
+
 test_done