fast-{import,export}: use get_sha1_hex() to read from marks file
It's wrong to call get_sha1() if they should be SHA-1s, plus inefficient. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
May 5, 2013 at 17:38 UTC
45c5d4a56bc3ef3b5088a07bdab12cef8163e61d
2 files changed
+2
-2
builtin/fast-export.c
+1
-1
@@ -623,7 +623,7 @@ static void import_marks(char *input_file)
623
624
mark = strtoumax(line + 1, &mark_end, 10);
625
if (!mark || mark_end == line + 1
626
- || *mark_end != ' ' || get_sha1(mark_end + 1, sha1))
626
+ || *mark_end != ' ' || get_sha1_hex(mark_end + 1, sha1))
627
die("corrupt mark line: %s", line);
628
629
if (last_idnum < mark)
fast-import.c
+1
-1
@@ -1822,7 +1822,7 @@ static void read_marks(void)
1822
*end = 0;
1823
mark = strtoumax(line + 1, &end, 10);
1824
if (!mark || end == line + 1
1825
- || *end != ' ' || get_sha1(end + 1, sha1))
1825
+ || *end != ' ' || get_sha1_hex(end + 1, sha1))
1826
die("corrupt mark line: %s", line);
1827
e = find_object(sha1);
1828
if (!e) {