From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 4 Jan 2019 21:33:33 +0000 (-0800)
Subject: Merge branch 'en/fast-export-import'
X-Git-Tag: v2.21.0-rc0~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d59753227d6f86dec2b108704bc04e727c5347f;p=thirdparty%2Fgit.git

Merge branch 'en/fast-export-import'

Small fixes and features for fast-export and fast-import, mostly on
the fast-export side.

* en/fast-export-import:
  fast-export: add a --show-original-ids option to show original names
  fast-import: remove unmaintained duplicate documentation
  fast-export: add --reference-excluded-parents option
  fast-export: ensure we export requested refs
  fast-export: when using paths, avoid corrupt stream with non-existent mark
  fast-export: move commit rewriting logic into a function for reuse
  fast-export: avoid dying when filtering by paths and old tags exist
  fast-export: use value from correct enum
  git-fast-export.txt: clarify misleading documentation about rev-list args
  git-fast-import.txt: fix documentation for --quiet option
  fast-export: convert sha1 to oid
---

4d59753227d6f86dec2b108704bc04e727c5347f
diff --cc builtin/fast-export.c
index 5790f0d554,36c2575de5..9e283482ef
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@@ -253,7 -272,10 +272,10 @@@ static void export_blob(const struct ob
  
  	mark_next_object(object);
  
- 	printf("blob\nmark :%"PRIu32"\ndata %"PRIuMAX"\n", last_idnum, (uintmax_t)size);
+ 	printf("blob\nmark :%"PRIu32"\n", last_idnum);
+ 	if (show_original_ids)
+ 		printf("original-oid %s\n", oid_to_hex(oid));
 -	printf("data %lu\n", size);
++	printf("data %"PRIuMAX"\n", (uintmax_t)size);
  	if (size && fwrite(buf, size, 1, stdout) != 1)
  		die_errno("could not write blob '%s'", oid_to_hex(oid));
  	printf("\n");