diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-18 13:32:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-18 13:32:54 -0800 |
| commit | b4e245a17adc1b336269f7350e88eede6e713157 (patch) | |
| tree | 36762f82926a1c900c67809ce977717cd1eb0b65 | |
| parent | dfbc63da03f584fd4f281dfaffc1cec50e076289 (diff) | |
| parent | c714d0587567d67e1c3702e44221c1b46dc969ff (diff) | |
| download | git-b4e245a17adc1b336269f7350e88eede6e713157.tar.gz | |
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
| -rw-r--r-- | oidset.c | 5 | ||||
| -rwxr-xr-x | t/t8013-blame-ignore-revs.sh | 4 |
2 files changed, 5 insertions, 4 deletions
@@ -72,9 +72,10 @@ void oidset_parse_file_carefully(struct oidset *set, const char *path, if (!sb.len) continue; - if (parse_oid_hex(sb.buf, &oid, &p) || *p != '\0' || - (fn && fn(&oid, cbdata))) + if (parse_oid_hex(sb.buf, &oid, &p) || *p != '\0') die("invalid object name: %s", sb.buf); + if (fn && fn(&oid, cbdata)) + continue; oidset_insert(set, &oid); } if (ferror(fp)) diff --git a/t/t8013-blame-ignore-revs.sh b/t/t8013-blame-ignore-revs.sh index 24ae5018e8..b18633dee1 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 |