summaryrefslogtreecommitdiff
path: root/merge-blobs.c
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2025-07-31 18:07:36 +0200
committerJunio C Hamano <gitster@pobox.com>2025-07-31 14:17:54 -0700
commit711a20827b7e99cda7329872c0e75860ddfb08bc (patch)
tree688136007eebcbfef782111e3b20fabf54838142 /merge-blobs.c
parent16bd9f20a403117f2e0d9bcda6c6e621d3763e77 (diff)
interactive: do strip trailing CRLF from input
`git reset -p file` on a Windows CMD refuses to do anything useful with this error message: (1/5) Unstage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? n 'nly one letter is expected, got 'n The letter 'O' at the beginning of the line is overwritten by an apostrophe, so, clearly the parser sees the string "n\r". strbuf_trim_trailing_newline() removes trailing CRLF from the string. In particular, it first removes LF if present, and if that was the case, it also removes CR if present. git_read_line_interactively() clearly intends to remove CRLF as it calls strbuf_trim_trailing_newline(). However, input is gathered using strbuf_getline_lf(), which already removes the trailing LF. Now strbuf_trim_trailing_newline() does not see LF, so that it does not remove CR, either, and leaves it for the caller to process. Call strbuf_getline() instead, which removes both LF and CR. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-blobs.c')
0 files changed, 0 insertions, 0 deletions