Merge branch 'en/fast-import-parsing-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Apr 2019 07:41:16 +0000 (16:41 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Apr 2019 07:41:16 +0000 (16:41 +0900)
commitdae82ecf147c58c6862d349fb8421d81f5868616
tree5ef032267002e423398cce3032059e5fc74fd33d
parent732ce7aaca15d32c1284d85498a0f2bda7406b95
parentcf7b857a77bda6a9a93e2cde2f6ae1764e7a2517
Merge branch 'en/fast-import-parsing-fix'

"git fast-import" update.

* en/fast-import-parsing-fix:
  fast-import: fix erroneous handling of get-mark with empty orphan commits
  fast-import: only allow cat-blob requests where it makes sense
  fast-import: check most prominent commands first
  git-fast-import.txt: fix wording about where ls command can appear
  t9300: demonstrate bug with get-mark and empty orphan commits