Merge branch 'en/strmap'

[thirdparty/git.git] / oidset.c

diff --git a/oidset.c b/oidset.c
index 2d0ab76fb569be21dacc68e66098a4814191325b..5aac633c1f405580447001dfae114660e6120e90 100644 (file)
--- 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))