From 8b504db309c3b08e8ba7bd425a5fa29c29d8a4d5 Mon Sep 17 00:00:00 2001 From: Quentin Neill Date: Sun, 31 May 2015 14:27:37 -0500 Subject: blame: add blame.showEmail configuration Complement existing --show-email option with fallback configuration variable, with tests. Signed-off-by: Quentin Neill Signed-off-by: Junio C Hamano --- t/t8002-blame.sh | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) (limited to 't/t8002-blame.sh') diff --git a/t/t8002-blame.sh b/t/t8002-blame.sh index 5cdf3f178..ff09aced6 100755 --- a/t/t8002-blame.sh +++ b/t/t8002-blame.sh @@ -19,4 +19,66 @@ test_expect_success 'blame --show-email' ' "" 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 + ( 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 result && + test_cmp expected_n result +' + +test_expect_success 'blame with showemail options' ' + git blame --show-email one >blame1 && + find_blame result && + test_cmp expected_e result && + git blame -e one >blame2 && + find_blame result && + test_cmp expected_e result && + git blame --no-show-email one >blame3 && + find_blame 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 result && + test_cmp expected_n result && + git blame --show-email one >blame2 && + find_blame result && + test_cmp expected_e result && + git blame -e one >blame3 && + find_blame result && + test_cmp expected_e result && + git blame --no-show-email one >blame4 && + find_blame 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 result && + test_cmp expected_e result && + git blame --no-show-email one >blame2 && + find_blame result && + test_cmp expected_n result +' + test_done -- cgit v1.2.1