diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:34:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:34:01 -0700 |
| commit | 811ce1b47c5486fa3348617d062e2eb4593962a1 (patch) | |
| tree | 431dd9d5d47b7ef6b38df1cec32209324529d23a /t | |
| parent | cd0120857b8112258cef72c0f5adb7f8e8df7c1c (diff) | |
| parent | 0269f968b7effea8a4f61f1fb0ac7e9386a9d90c (diff) | |
| download | git-811ce1b47c5486fa3348617d062e2eb4593962a1.tar.gz | |
Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3
Documentation fix.
* mm/usage-log-l-can-take-regex:
log -L: improve error message on malformed argument
Documentation: change -L:<regex> to -L:<funcname>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4211-line-log.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh index 0901b30982..4451127eb2 100755 --- a/t/t4211-line-log.sh +++ b/t/t4211-line-log.sh @@ -54,14 +54,14 @@ canned_test "-L 4:a.c -L 8,12:a.c simple" multiple-superset canned_test "-L 8,12:a.c -L 4:a.c simple" multiple-superset test_bad_opts "-L" "switch.*requires a value" -test_bad_opts "-L b.c" "argument.*not of the form" -test_bad_opts "-L 1:" "argument.*not of the form" +test_bad_opts "-L b.c" "argument not .start,end:file" +test_bad_opts "-L 1:" "argument not .start,end:file" test_bad_opts "-L 1:nonexistent" "There is no path" test_bad_opts "-L 1:simple" "There is no path" -test_bad_opts "-L '/foo:b.c'" "argument.*not of the form" +test_bad_opts "-L '/foo:b.c'" "argument not .start,end:file" test_bad_opts "-L 1000:b.c" "has only.*lines" test_bad_opts "-L 1,1000:b.c" "has only.*lines" -test_bad_opts "-L :b.c" "argument.*not of the form" +test_bad_opts "-L :b.c" "argument not .start,end:file" test_bad_opts "-L :foo:b.c" "no match" test_expect_success '-L X (X == nlines)' ' |