undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase-i: work around Windows CRLF line endings

Browse Source 
Editors on Windows can and do save text files with CRLF line
endings, which is the convention on the platform.  We are seeing
reports that the "read" command in a port of bash to the environment
however does not strip the CRLF at the end, not adjusting for the
same convention on the platform.

This breaks the recently added sanity checks for the insn sheet fed
to "rebase -i"; instead of an empty line (hence nothing in $command),
the script was getting a lone CR in there.

Special case a lone CR and treat it the same way as an empty line to
work this around.

This patch (also) passes the test with Git for Windows, where the
issue was seen first.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2015-10-28 15:54:48 +01:00
parent 1db25aae5e
commit 39743cf554
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-rebase--interactive.sh
View File

@ -77,6 +77,10 @@ amend="$state_dir"/amend
rewritten_list="$state_dir"/rewritten-list rewritten_list="$state_dir"/rewritten-list
rewritten_pending="$state_dir"/rewritten-pending rewritten_pending="$state_dir"/rewritten-pending
# Work around Git for Windows' Bash whose "read" does not strip CRLF
# and leaves CR at the end instead.
cr=$(printf "\015")
strategy_args= strategy_args=
if test -n "$do_merge" if test -n "$do_merge"
then then
@ -518,6 +522,10 @@ do_next () {
"$comment_char"*|''|noop|drop|d) "$comment_char"*|''|noop|drop|d)
mark_action_done mark_action_done
;; ;;
"$cr")
# Work around CR left by "read" (e.g. with Git for Windows' Bash).
mark_action_done
;;
pick|p) pick|p)
comment_for_reflog pick comment_for_reflog pick
@ -888,6 +896,10 @@ check_bad_cmd_and_sha () {
"$comment_char"*|''|noop|x|exec) "$comment_char"*|''|noop|x|exec)
# Doesn't expect a SHA-1 # Doesn't expect a SHA-1
;; ;;
"$cr")
# Work around CR left by "read" (e.g. with Git for
# Windows' Bash).
;;
pick|p|drop|d|reword|r|edit|e|squash|s|fixup|f) pick|p|drop|d|reword|r|edit|e|squash|s|fixup|f)
if ! check_commit_sha "${rest%%[ ]*}" "$lineno" "$1" if ! check_commit_sha "${rest%%[ ]*}" "$lineno" "$1"
then then

2
t/t3404-rebase-interactive.sh
View File

@ -1240,7 +1240,7 @@ test_expect_success 'static check of bad SHA-1' '
test E = $(git cat-file commit HEAD | sed -ne \$p) test E = $(git cat-file commit HEAD | sed -ne \$p)
' '
test_expect_failure 'editor saves as CR/LF' ' test_expect_success 'editor saves as CR/LF' '
git checkout -b with-crlf && git checkout -b with-crlf &&
write_script add-crs.sh <<-\EOF && write_script add-crs.sh <<-\EOF &&
sed -e "s/\$/Q/" <"$1" | tr Q "\\015" >"$1".new && sed -e "s/\$/Q/" <"$1" | tr Q "\\015" >"$1".new &&