Skip to content
  • Junio C Hamano's avatar
    Read attributes from the index that is being checked out · 06f33c17
    Junio C Hamano authored
    
    
    Traditionally we used .gitattributes file from the work tree if exists,
    and otherwise read from the index as a fallback.  When switching to a
    branch that has an updated .gitattributes file, and entries in it give
    different attributes to other paths being checked out, we should instead
    read from the .gitattributes in the index.
    
    This breaks a use case of fixing incorrect entries in the .gitattributes
    in the work tree (without adding it to the index) and checking other paths
    out, though.
    
        $ edit .gitattributes ;# mark foo.dat as binary
        $ rm foo.dat
        $ git checkout foo.dat
    
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    06f33c17