summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-02 22:48:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-02 22:48:28 (GMT)
commitdbbc93b221c6ee9cb2d417a43078b0d2a986fd33 (patch)
tree3f2406982bcf8f9fbb5b7b3bc852a1b5fcbfbc99 /fast-import.c
parent843fb919fd68739f3cc8f94e6a0225ead97e1e7e (diff)
parent45c5d4a56bc3ef3b5088a07bdab12cef8163e61d (diff)
downloadgit-dbbc93b221c6ee9cb2d417a43078b0d2a986fd33.zip
git-dbbc93b221c6ee9cb2d417a43078b0d2a986fd33.tar.gz
git-dbbc93b221c6ee9cb2d417a43078b0d2a986fd33.tar.bz2
Merge branch 'fc/fast-export-persistent-marks'
Optimization for fast-export by avoiding unnecessarily resolving arbitrary object name and parsing object when only presence and type information is necessary, etc. * fc/fast-export-persistent-marks: fast-{import,export}: use get_sha1_hex() to read from marks file fast-export: don't parse commits while reading marks file fast-export: do not parse non-commit objects while reading marks file
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c
index 6d94453..23f625f 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) {