summaryrefslogtreecommitdiff
path: root/diffcore-rename.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-06-16 14:33:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-16 14:33:44 -0700
commit070d276cc15494184d2004d506e663f0cb791d44 (patch)
tree66fda933738d92a0730ed73902a3f0fad0dd04cd /diffcore-rename.c
parentMerge branch 'jk/stash-options' into maint (diff)
parentsha1_file: pass empty buffer to index empty file (diff)
downloadtgif-070d276cc15494184d2004d506e663f0cb791d44.tar.xz
Merge branch 'jh/filter-empty-contents' into maint
The clean/smudge interface did not work well when filtering an empty contents (failed and then passed the empty input through). It can be argued that a filter that produces anything but empty for an empty input is nonsense, but if the user wants to do strange things, then why not? * jh/filter-empty-contents: sha1_file: pass empty buffer to index empty file
Diffstat (limited to 'diffcore-rename.c')
0 files changed, 0 insertions, 0 deletions