diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-22 10:29:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-22 10:29:15 -0700 |
| commit | 0c493966ff6af8d2217aaa40dd6f7916bd992b0a (patch) | |
| tree | 1774f32283a00734ac2739d0343dc7bf4c37bc5d /t/t7605-merge-resolve.sh | |
| parent | Merge branch 'rs/merge-microcleanup' (diff) | |
| parent | strbuf: clear errno before calling getdelim(3) (diff) | |
| download | tgif-0c493966ff6af8d2217aaa40dd6f7916bd992b0a.tar.xz | |
Merge branch 'rs/strbuf-getwholeline-fix'
A helper function to read a single whole line into strbuf
mistakenly triggered OOM error at EOF under certain conditions,
which has been fixed.
* rs/strbuf-getwholeline-fix:
strbuf: clear errno before calling getdelim(3)
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions