Skip to content
  • Elijah Newren's avatar
    fast-import: fix erroneous handling of get-mark with empty orphan commits · cf7b857a
    Elijah Newren authored and Junio C Hamano's avatar Junio C Hamano committed
    When get-mark was introduced in commit 28c7b1f7 ("fast-import: add a
    get-mark command", 2015-07-01), it followed the precedent of the
    cat-blob command to be allowed on any line other than in the middle of a
    data directive; see commit 777f80d7
    
     ("fast-import: Allow cat-blob
    requests at arbitrary points in stream", 2010-11-28).  It was useful to
    allow cat-blob directives in the middle of a commit to get more data
    that would be used in writing the current commit object.  get-mark is
    not similarly useful since fast-import can already use either object id
    or mark.  Further, trying to allow this command anywhere caused parsing
    bugs.  Fix the parsing problems by only allowing get-mark commands to
    appear when other commands have completed.
    
    Signed-off-by: default avatarElijah Newren <newren@gmail.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    cf7b857a