]> rtime.felk.cvut.cz Git - git.git/commitdiff
Merge branch 'rs/refresh-beyond-symlink'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Sep 2014 19:54:01 +0000 (12:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Sep 2014 19:54:01 +0000 (12:54 -0700)
"git add x" where x that used to be a directory has become a
symbolic link to a directory misbehaved.

* rs/refresh-beyond-symlink:
  read-cache: check for leading symlinks when refreshing index

1  2 
read-cache.c

diff --cc read-cache.c
Simple merge