summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-05-05 22:38:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-05-07 23:20:40 (GMT)
commit45c5d4a56bc3ef3b5088a07bdab12cef8163e61d (patch)
treec4cce9a03006a0c68c8b832c699c1cb2e30cce91
parent47bd9bf82daeac71b28a5a697ecc44e70b205e18 (diff)
downloadgit-45c5d4a56bc3ef3b5088a07bdab12cef8163e61d.zip
git-45c5d4a56bc3ef3b5088a07bdab12cef8163e61d.tar.gz
git-45c5d4a56bc3ef3b5088a07bdab12cef8163e61d.tar.bz2
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>
-rw-r--r--builtin/fast-export.c2
-rw-r--r--fast-import.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 18fdfb3..d1d68e9 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -623,7 +623,7 @@ static void import_marks(char *input_file)
mark = strtoumax(line + 1, &mark_end, 10);
if (!mark || mark_end == line + 1
- || *mark_end != ' ' || get_sha1(mark_end + 1, sha1))
+ || *mark_end != ' ' || get_sha1_hex(mark_end + 1, sha1))
die("corrupt mark line: %s", line);
if (last_idnum < mark)
diff --git a/fast-import.c b/fast-import.c
index 5f539d7..3f32149 100644
--- 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) {