log -L: test merge of parallel modify/rename

diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 2a67e31bd74d3ac9c0d301afbfc166078c845880..bba0b093d5df822f2896b55beaf5384d3a0c1262 100755 (executable)
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -8,13 +8,20 @@ test_expect_success 'setup (import history)' '
        git reset --hard
 '
 
-canned_test () {
-       test_expect_success "$1" "
-               git log $1 >actual &&
-               test_cmp \"\$TEST_DIRECTORY\"/t4211/expect.$2 actual
+canned_test_1 () {
+       test_expect_$1 "$2" "
+               git log $2 >actual &&
+               test_cmp \"\$TEST_DIRECTORY\"/t4211/expect.$3 actual
        "
 }
 
+canned_test () {
+       canned_test_1 success "$@"
+}
+canned_test_failure () {
+       canned_test_1 failure "$@"
+}
+
 test_bad_opts () {
        test_expect_success "invalid args: $1" "
                test_must_fail git log $1 2>errors &&
@@ -38,6 +45,7 @@ canned_test "-L '/long f/',/^}/:a.c -L /main/,/^}/:a.c simple" two-ranges
 canned_test "-L 24,+1:a.c simple" vanishes-early
 
 canned_test "-M -L '/long f/,/^}/:b.c' move-support" move-support-f
+canned_test_failure "-M -L ':f:b.c' parallel-change" parallel-change-f-to-main
 
 canned_test "-L 4,12:a.c -L :main:a.c simple" multiple
 canned_test "-L 4,18:a.c -L :main:a.c simple" multiple-overlapping