Re: Request for change 610e2b9240 reversal

Barret Rhoden [off-list ref] writes:

On 11/10/20 6:38 AM, René Scharfe wrote:
[snip]

quoted

Reported-by: Jean-Yves Avenard <redacted>
Signed-off-by: René Scharfe <redacted>

patch looks good to me.

Reviewed-by: Barret Rhoden <redacted>

Thanks,

Barret

Yes, I do recall that we discussed reverting half of that change and
then I forgot to follow through.

Thanks, all.  Will queue.

quoted

---
  oidset.c                     | 5 +++--
  t/t8013-blame-ignore-revs.sh | 4 ++--
  2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/oidset.c b/oidset.c
index 2d0ab76fb5..5aac633c1f 100644
--- a/oidset.c
+++ b/oidset.c

@@ -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
--

2.29.2