From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 2 Jun 2013 22:48:28 +0000 (-0700)
Subject: Merge branch 'fc/fast-export-persistent-marks'
X-Git-Tag: v1.8.4-rc0~238
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dbbc93b221c6ee9cb2d417a43078b0d2a986fd33?hp=-c

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
---

dbbc93b221c6ee9cb2d417a43078b0d2a986fd33
diff --combined fast-import.c
index 6d94453026,3f3214935f..23f625f561
--- a/fast-import.c
+++ b/fast-import.c
@@@ -297,7 -297,7 +297,7 @@@ static int failure
  static FILE *pack_edges;
  static unsigned int show_stats = 1;
  static int global_argc;
 -static const char **global_argv;
 +static char **global_argv;
  
  /* Memory pools */
  static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool);
@@@ -1822,7 -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) {
@@@ -3347,7 -3347,7 +3347,7 @@@ static void parse_argv(void
  		read_marks();
  }
  
 -int main(int argc, const char **argv)
 +int main(int argc, char **argv)
  {
  	unsigned int i;