diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-01 12:45:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-01 12:45:11 -0700 |
| commit | 152722f155165cbeca43c7e82abe68e66d088b33 (patch) | |
| tree | 5812a9e9b1ff1c2b134feac290ce9094b1c6b632 /mergesort.c | |
| parent | Merge branch 'ah/usage-strings' (diff) | |
| parent | sha1_file: pass empty buffer to index empty file (diff) | |
| download | tgif-152722f155165cbeca43c7e82abe68e66d088b33.tar.xz | |
Merge branch 'jh/filter-empty-contents'
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 'mergesort.c')
0 files changed, 0 insertions, 0 deletions