summaryrefslogtreecommitdiff
path: root/Documentation/howto
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2017-03-15 02:31:30 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-15 12:08:10 -0700
commit18ec800512eb0634a0bf5e86b36ed156fbee73f3 (patch)
treeffd9ab32ead843561af695169904b0493a060897 /Documentation/howto
parentt7800: cleanup cruft left behind by tests (diff)
downloadtgif-18ec800512eb0634a0bf5e86b36ed156fbee73f3.tar.xz
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>
Diffstat (limited to 'Documentation/howto')
0 files changed, 0 insertions, 0 deletions