From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Apr 2019 07:41:16 +0000 (+0900)
Subject: Merge branch 'en/fast-import-parsing-fix'
X-Git-Tag: v2.22.0-rc0~59
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dae82ecf147c58c6862d349fb8421d81f5868616

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

dae82ecf147c58c6862d349fb8421d81f5868616