projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 98fde5e) | patch
difftool: handle modified symlinks in dir-diff mode
authorDavid Aguilar <davvid@gmail.com>
Wed, 15 Mar 2017 09:31:30 +0000 (02:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Mar 2017 19:08:10 +0000 (12:08 -0700)
commit18ec800512eb0634a0bf5e86b36ed156fbee73f3
treeffd9ab32ead843561af695169904b0493a060897tree | snapshot
parent98fde5e47b684c7be28e5c0c2a80354cf088d41dcommit | diff
difftool: handle modified symlinks in dir-diff mode

Detect the null object ID for symlinks in dir-diff so that difftool can
detect when symlinks are modified in the worktree.

Previously, a null symlink object ID would crash difftool.
Handle null object IDs as unknown content that must be read from
the worktree.

Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/difftool.c diff | blob | blame | history
t/t7800-difftool.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.