diff options
| author |  David Aguilar <davvid@gmail.com> | 2017-03-15 02:31:30 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-03-15 12:08:10 -0700 |
| commit | 18ec800512eb0634a0bf5e86b36ed156fbee73f3 (patch) | |
| tree | ffd9ab32ead843561af695169904b0493a060897 /Documentation/git-am.txt | |
| parent | t7800: cleanup cruft left behind by tests (diff) | |
| download | tgif-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/git-am.txt')
0 files changed, 0 insertions, 0 deletions