Fourth batch

diff --git a/t/t8002-blame.sh b/t/t8002-blame.sh
index 5cdf3f178e8b94481370bcc8385248ec88e46f2c..eea048e52ceb328fd5d97b17e996c8f821ae4abb 100755 (executable)
--- a/t/t8002-blame.sh
+++ b/t/t8002-blame.sh
@@ -6,6 +6,11 @@ test_description='git blame'
 PROG='git blame -c'
 . "$TEST_DIRECTORY"/annotate-tests.sh
 
+test_expect_success 'blame untracked file in empty repo' '
+       >untracked &&
+       test_must_fail git blame untracked
+'
+
 PROG='git blame -c -e'
 test_expect_success 'blame --show-email' '
        check_count \
@@ -19,4 +24,102 @@ test_expect_success 'blame --show-email' '
                "<E at test dot git>" 1
 '
 
+test_expect_success 'setup showEmail tests' '
+       echo "bin: test number 1" >one &&
+       git add one &&
+       GIT_AUTHOR_NAME=name1 \
+       GIT_AUTHOR_EMAIL=email1@test.git \
+       git commit -m First --date="2010-01-01 01:00:00" &&
+       cat >expected_n <<-\EOF &&
+       (name1 2010-01-01 01:00:00 +0000 1) bin: test number 1
+       EOF
+       cat >expected_e <<-\EOF
+       (<email1@test.git> 2010-01-01 01:00:00 +0000 1) bin: test number 1
+       EOF
+'
+
+find_blame () {
+       sed -e 's/^[^(]*//'
+}
+
+test_expect_success 'blame with no options and no config' '
+       git blame one >blame &&
+       find_blame <blame >result &&
+       test_cmp expected_n result
+'
+
+test_expect_success 'blame with showemail options' '
+       git blame --show-email one >blame1 &&
+       find_blame <blame1 >result &&
+       test_cmp expected_e result &&
+       git blame -e one >blame2 &&
+       find_blame <blame2 >result &&
+       test_cmp expected_e result &&
+       git blame --no-show-email one >blame3 &&
+       find_blame <blame3 >result &&
+       test_cmp expected_n result
+'
+
+test_expect_success 'blame with showEmail config false' '
+       git config blame.showEmail false &&
+       git blame one >blame1 &&
+       find_blame <blame1 >result &&
+       test_cmp expected_n result &&
+       git blame --show-email one >blame2 &&
+       find_blame <blame2 >result &&
+       test_cmp expected_e result &&
+       git blame -e one >blame3 &&
+       find_blame <blame3 >result &&
+       test_cmp expected_e result &&
+       git blame --no-show-email one >blame4 &&
+       find_blame <blame4 >result &&
+       test_cmp expected_n result
+'
+
+test_expect_success 'blame with showEmail config true' '
+       git config blame.showEmail true &&
+       git blame one >blame1 &&
+       find_blame <blame1 >result &&
+       test_cmp expected_e result &&
+       git blame --no-show-email one >blame2 &&
+       find_blame <blame2 >result &&
+       test_cmp expected_n result
+'
+
+test_expect_success 'set up abbrev tests' '
+       test_commit abbrev &&
+       sha1=$(git rev-parse --verify HEAD) &&
+       check_abbrev () {
+               expect=$1; shift
+               echo $sha1 | cut -c 1-$expect >expect &&
+               git blame "$@" abbrev.t >actual &&
+               perl -lne "/[0-9a-f]+/ and print \$&" <actual >actual.sha &&
+               test_cmp expect actual.sha
+       }
+'
+
+test_expect_success 'blame --abbrev=<n> works' '
+       # non-boundary commits get +1 for alignment
+       check_abbrev 31 --abbrev=30 HEAD &&
+       check_abbrev 30 --abbrev=30 ^HEAD
+'
+
+test_expect_success 'blame -l aligns regular and boundary commits' '
+       check_abbrev 40 -l HEAD &&
+       check_abbrev 39 -l ^HEAD
+'
+
+test_expect_success 'blame --abbrev=40 behaves like -l' '
+       check_abbrev 40 --abbrev=40 HEAD &&
+       check_abbrev 39 --abbrev=40 ^HEAD
+'
+
+test_expect_success '--no-abbrev works like --abbrev=40' '
+       check_abbrev 40 --no-abbrev
+'
+
+test_expect_success '--exclude-promisor-objects does not BUG-crash' '
+       test_must_fail git blame --exclude-promisor-objects one
+'
+
 test_done