diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:30 -0800 |
| commit | c04b3a2dbff67605078139f97d4546716e4a1f40 (patch) | |
| tree | 731b606c724015edc2169ec153472bd67fc9639c /t | |
| parent | Merge branch 'js/clone-dissociate' into maint (diff) | |
| parent | rebase-i: work around Windows CRLF line endings (diff) | |
| download | tgif-c04b3a2dbff67605078139f97d4546716e4a1f40.tar.xz | |
Merge branch 'gr/rebase-i-drop-warn' into maint
Recent update to "rebase -i" that tries to sanity check the edited
insn sheet before it uses it has become too picky on Windows where
CRLF left by the editor is turned into a trailing CR on the line
read via the "read" built-in command.
* gr/rebase-i-drop-warn:
rebase-i: work around Windows CRLF line endings
t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 3de0b1dcfd..98eb49ac23 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1261,4 +1261,16 @@ test_expect_success 'static check of bad SHA-1' ' test E = $(git cat-file commit HEAD | sed -ne \$p) ' +test_expect_success 'editor saves as CR/LF' ' + git checkout -b with-crlf && + write_script add-crs.sh <<-\EOF && + sed -e "s/\$/Q/" <"$1" | tr Q "\\015" >"$1".new && + mv -f "$1".new "$1" + EOF + ( + test_set_editor "$(pwd)/add-crs.sh" && + git rebase -i HEAD^ + ) +' + test_done |