Skip to content
  • Martin Erik Werner's avatar
    setup: don't dereference in-tree symlinks for absolute paths · 655ee9ea
    Martin Erik Werner authored and Junio C Hamano's avatar Junio C Hamano committed
    
    
    The prefix_path_gently() function currently applies real_path to
    everything if given an absolute path, dereferencing symlinks both
    outside and inside the work tree.
    
    This causes most high-level functions to misbehave when acting on
    symlinks given via absolute paths. For example
    
    	$ git add /dir/repo/symlink
    
    attempts to add the target of the symlink rather than the symlink
    itself, which is usually not what the user intends to do.
    
    In order to manipulate symlinks in the work tree using absolute paths,
    symlinks should only be dereferenced outside the work tree.
    
    Modify the prefix_path_gently() to first normalize the path in order to
    make sure path levels are separated by '/', then pass the result to
    'abspath_part_inside_repo' to find the part inside the work tree
    (without dereferencing any symlinks inside the work tree).
    
    For absolute paths, prefix_path_gently() did not, nor does now do, any
    actual prefixing, hence the result from abspath_part_in_repo() is
    returned as-is.
    
    Fixes t0060-82 and t3004-5.
    
    Signed-off-by: default avatarMartin Erik Werner <martinerikwerner@gmail.com>
    Reviewed-by: default avatarDuy Nguyen <pclouds@gmail.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    655ee9ea