summaryrefslogtreecommitdiff
path: root/t/t8013-blame-ignore-revs.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-11-18 21:32:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-11-18 21:32:54 (GMT)
commitb4e245a17adc1b336269f7350e88eede6e713157 (patch)
tree36762f82926a1c900c67809ce977717cd1eb0b65 /t/t8013-blame-ignore-revs.sh
parentdfbc63da03f584fd4f281dfaffc1cec50e076289 (diff)
parentc714d0587567d67e1c3702e44221c1b46dc969ff (diff)
downloadgit-b4e245a17adc1b336269f7350e88eede6e713157.zip
git-b4e245a17adc1b336269f7350e88eede6e713157.tar.gz
git-b4e245a17adc1b336269f7350e88eede6e713157.tar.bz2
Merge branch 'jc/blame-ignore-fix'
"git blame --ignore-revs-file=<file>" learned to ignore a non-existent object name in the input, instead of complaining. * jc/blame-ignore-fix: blame: silently ignore invalid ignore file objects
Diffstat (limited to 't/t8013-blame-ignore-revs.sh')
-rwxr-xr-xt/t8013-blame-ignore-revs.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t8013-blame-ignore-revs.sh b/t/t8013-blame-ignore-revs.sh
index 24ae501..b18633d 100755
--- a/t/t8013-blame-ignore-revs.sh
+++ b/t/t8013-blame-ignore-revs.sh
@@ -39,10 +39,10 @@ test_expect_success 'validate --ignore-rev' '
test_must_fail git blame --ignore-rev X^{tree} file
'
-# Ensure bogus --ignore-revs-file requests are caught
+# Ensure bogus --ignore-revs-file requests are silently accepted
test_expect_success 'validate --ignore-revs-file' '
git rev-parse X^{tree} >ignore_x &&
- test_must_fail git blame --ignore-revs-file ignore_x file
+ git blame --ignore-revs-file ignore_x file
'
for I in X XT