Skip to content
  • Junio C Hamano's avatar
    update-index: allow --index-info to add higher stages. · d23748a6
    Junio C Hamano authored
    
    
    The new merge world order tells the merge strategies to leave
    the cache unmerged and store the automerge result in the working
    tree if automerge is not clean.  This was done for the resolve
    strategy and recursive strategy when no rename is involved, but
    recording a conflicting merge in the rename case could not
    easily be done by the recursive strategy.
    
    This commit adds a new input format, in addition to the exsting
    two, to "update-index --index-info".
    
        (1) mode         SP sha1          TAB path
        The first format is what "git-apply --index-info"
        reports, and used to reconstruct a partial tree
        that is used for phony merge base tree when falling
        back on 3-way merge.
    
        (2) mode SP type SP sha1          TAB path
        The second format is to stuff git-ls-tree output
        into the index file.
    
        (3) mode         SP sha1 SP stage TAB path
        This format is to put higher order stages into the
        index file and matches git-ls-files --stage output.
    
    To place a higher stage entry to the index, the path should
    first be removed by feeding a mode=0 entry for the path, and
    then feeding necessary input lines in the (3) format.
    
    For example, starting with this index:
    
    $ git ls-files -s
    100644 8a1218a1024a212bb3db30becd860315f9f3ac52 0       frotz
    
    $ git update-index --index-info ;# interactive session -- input follows...
    
    0 0000000000000000000000000000000000000000	frotz
    100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1	frotz
    100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2	frotz
    
    The first line of the input feeds 0 as the mode to remove the
    path; the SHA1 does not matter as long as it is well formatted.
    Then the second and third line feeds stage 1 and stage 2 entries
    for that path.  After the above, we would end up with this:
    
    $ git ls-files -s
    100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1	frotz
    100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2	frotz
    
    This completes the groundwork for the new merge world order.
    
    Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
    d23748a6