Skip to content
  • Duy Nguyen's avatar
    diff-lib: allow ita entries treated as "not yet exist in index" · 425a28e0
    Duy Nguyen authored and Junio C Hamano's avatar Junio C Hamano committed
    When comparing the index and the working tree to show which paths are
    new, and comparing the tree recorded in the HEAD and the index to see if
    committing the contents recorded in the index would result in an empty
    commit, we would want the former comparison to say "these are new paths"
    and the latter to say "there is no change" for paths that are marked as
    intent-to-add.
    
    We made a similar attempt at d95d728a ("diff-lib.c: adjust position of
    i-t-a entries in diff", 2015-03-16), which redefined the semantics of
    these two comparison modes globally, which was a disaster and had to be
    reverted at 78cc1a54
    
     ("Revert "diff-lib.c: adjust position of i-t-a
    entries in diff"", 2015-06-23).
    
    To make sure we do not repeat the same mistake, introduce a new internal
    diffopt option so that this different semantics can be asked for only by
    callers that ask it, while making sure other unaudited callers will get
    the same comparison result.
    
    Signed-off-by: default avatarNguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    425a28e0