Merge branch 'mh/ref-races-optim-invalidate-cached'

diff --git a/fast-import.c b/fast-import.c
index 6d9445302614318c0322fdb2fc403aa22cd79804..23f625f561dfd664a460827d507e7c0b720e9849 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1822,7 +1822,7 @@ static void read_marks(void)
                *end = 0;
                mark = strtoumax(line + 1, &end, 10);
                if (!mark || end == line + 1
-                       || *end != ' ' || get_sha1(end + 1, sha1))
+                       || *end != ' ' || get_sha1_hex(end + 1, sha1))
                        die("corrupt mark line: %s", line);
                e = find_object(sha1);
                if (!e) {