| commit | 99845c3e32663e5ed63df28048de6c990535ef53 | |
| author | Johannes Sixt <j6t@kdbg.org> | |
| Tue, 11 Aug 2015 08:30:27 +0000 (11 10:30 +0200) | ||
| committer | Johannes Sixt <j6t@kdbg.org> | |
| Tue, 10 Nov 2015 08:12:01 +0000 (10 09:12 +0100) | ||
| tree | 381c4b1c611be1ca508225b420ed6c4e39d53e08 | treesnapshot (tar.gz zip) |
| parent | c18975121ac94bcf2a9cba06199be0279e958293 | commitdiff |
revisions --stdin: accept CRLF line terminators
On Windows, 'git rebase -i' with rebase.missingCommitsCheck set to
warn or error reports:
Dropped commits (newer to older):
'atal: bad revision '410dee56...
The error comes from the git rev-list --stdin invocation in
git-rebase--interactive.sh (function check_todo_list). It is caused by
CRs that end up in the file "$todo".miss, because many tools of the MSYS
toolset force LF to CRLF conversion when files are written via stdout.
To fix the error, permit CRLF line terminations when revisions and
pathspec are read using the --stdin option.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
On Windows, 'git rebase -i' with rebase.missingCommitsCheck set to
warn or error reports:
Dropped commits (newer to older):
'atal: bad revision '410dee56...
The error comes from the git rev-list --stdin invocation in
git-rebase--interactive.sh (function check_todo_list). It is caused by
CRs that end up in the file "$todo".miss, because many tools of the MSYS
toolset force LF to CRLF conversion when files are written via stdout.
To fix the error, permit CRLF line terminations when revisions and
pathspec are read using the --stdin option.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
| revision.c | diffblobblamehistory | |
| t/t6017-rev-list-stdin.sh | diffblobblamehistory |