Use "git merge" instead of "git pull ."

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 3aa696443996412d9580a6993678cf79a1f42289..d4e7f4736f74e58da504a04be3898b0a4078fedb 100644 (file)
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -3,9 +3,19 @@
 
 check_count () {
        head= &&
-       case "$1" in -h) head="$2"; shift; shift ;; esac &&
-       echo "$PROG file $head" >&4 &&
-       $PROG file $head >actual &&
+       file='file' &&
+       options= &&
+       while :
+       do
+               case "$1" in
+               -h) head="$2"; shift; shift ;;
+               -f) file="$2"; shift; shift ;;
+               -*) options="$options $1"; shift ;;
+               *) break ;;
+               esac
+       done &&
+       echo "$PROG $options $file $head" >&4 &&
+       $PROG $options $file $head >actual &&
        perl -e '
                my %expect = (@ARGV);
                my %count = map { $_ => 0 } keys %expect;
@@ -142,3 +152,135 @@ test_expect_success 'setup obfuscated email' '
 test_expect_success 'blame obfuscated email' '
        check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 '
+
+test_expect_success 'blame -L 1 (all)' '
+       check_count -L1 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+'
+
+test_expect_success 'blame -L , (all)' '
+       check_count -L, A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+'
+
+test_expect_success 'blame -L X (X to end)' '
+       check_count -L5 B1 1 C 1 D 1 "A U Thor" 1
+'
+
+test_expect_success 'blame -L X, (X to end)' '
+       check_count -L5, B1 1 C 1 D 1 "A U Thor" 1
+'
+
+test_expect_success 'blame -L ,Y (up to Y)' '
+       check_count -L,3 A 1 B2 1 E 1
+'
+
+test_expect_success 'blame -L X,X' '
+       check_count -L3,3 B2 1
+'
+
+test_expect_success 'blame -L X,Y' '
+       check_count -L3,6 B 1 B1 1 B2 1 D 1
+'
+
+test_expect_success 'blame -L Y,X (undocumented)' '
+       check_count -L6,3 B 1 B1 1 B2 1 D 1
+'
+
+test_expect_success 'blame -L X,+1' '
+       check_count -L3,+1 B2 1
+'
+
+test_expect_success 'blame -L X,+N' '
+       check_count -L3,+4 B 1 B1 1 B2 1 D 1
+'
+
+test_expect_success 'blame -L X,-1' '
+       check_count -L3,-1 B2 1
+'
+
+test_expect_success 'blame -L X,-N' '
+       check_count -L6,-4 B 1 B1 1 B2 1 D 1
+'
+
+test_expect_success 'blame -L /RE/ (RE to end)' '
+       check_count -L/evil/ C 1 "A U Thor" 1
+'
+
+test_expect_success 'blame -L /RE/,/RE2/' '
+       check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
+'
+
+test_expect_success 'blame -L X,/RE/' '
+       check_count -L5,/evil/ B1 1 D 1 "A U Thor" 1
+'
+
+test_expect_success 'blame -L /RE/,Y' '
+       check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
+'
+
+test_expect_success 'blame -L /RE/,+N' '
+       check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
+'
+
+test_expect_success 'blame -L /RE/,-N' '
+       check_count -L/99/,-3 B 1 B2 1 D 1
+'
+
+test_expect_success 'blame -L X (X > nlines)' '
+       test_must_fail $PROG -L12345 file
+'
+
+test_expect_success 'blame -L ,Y (Y > nlines)' '
+       test_must_fail $PROG -L,12345 file
+'
+
+test_expect_success 'setup -L :regex' '
+       tr Q "\\t" >hello.c <<-\EOF &&
+       int main(int argc, const char *argv[])
+       {
+       Qputs("hello");
+       }
+       EOF
+       git add hello.c &&
+       GIT_AUTHOR_NAME="F" GIT_AUTHOR_EMAIL="F@test.git" \
+       git commit -m "hello" &&
+
+       mv hello.c hello.orig &&
+       sed -e "/}/ {x; s/$/Qputs(\"goodbye\");/; G;}" <hello.orig |
+       tr Q "\\t" >hello.c &&
+       GIT_AUTHOR_NAME="G" GIT_AUTHOR_EMAIL="G@test.git" \
+       git commit -a -m "goodbye" &&
+
+       mv hello.c hello.orig &&
+       echo "#include <stdio.h>" >hello.c &&
+       cat hello.orig >>hello.c &&
+       tr Q "\\t" >>hello.c <<-\EOF
+       void mail()
+       {
+       Qputs("mail");
+       }
+       EOF
+       GIT_AUTHOR_NAME="H" GIT_AUTHOR_EMAIL="H@test.git" \
+       git commit -a -m "mail"
+'
+
+test_expect_success 'blame -L :literal' '
+       check_count -f hello.c -L:main F 4 G 1
+'
+
+test_expect_success 'blame -L :regex' '
+       check_count -f hello.c "-L:m[a-z][a-z]l" H 4
+'
+
+test_expect_success 'blame -L :nomatch' '
+       test_must_fail $PROG -L:nomatch hello.c
+'
+
+test_expect_success 'blame -L bogus' '
+       test_must_fail $PROG -L file &&
+       test_must_fail $PROG -L1,+ file &&
+       test_must_fail $PROG -L1,- file &&
+       test_must_fail $PROG -LX file &&
+       test_must_fail $PROG -L1,X file &&
+       test_must_fail $PROG -L1,+N file &&
+       test_must_fail $PROG -L1,-N file
+'