diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-21 01:26:53 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-21 01:26:53 +0300 |
| commit | 0a88638b0b2f52f588c21de3c0a8af6b49a2e540 (patch) | |
| tree | 02502b9f368c2c62a135c3758951af6614499a7d /t | |
| parent | 87d6bec2c8ff5a254e455ed67ced29006c504d9a (diff) | |
| parent | c970d30c2c362259316b5d63ef81fde591095a1b (diff) | |
Merge branch 'ah/convert-warning-message'
Update a few end-user facing messages around eol conversion.
* ah/convert-warning-message:
convert: clarify line ending conversion warning
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0027-auto-crlf.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh index 0feb41a23f..7f80f46393 100755 --- a/t/t0027-auto-crlf.sh +++ b/t/t0027-auto-crlf.sh @@ -77,12 +77,12 @@ create_NNO_MIX_files () { check_warning () { case "$1" in - LF_CRLF) echo "warning: LF will be replaced by CRLF" >"$2".expect ;; - CRLF_LF) echo "warning: CRLF will be replaced by LF" >"$2".expect ;; - '') >"$2".expect ;; + LF_CRLF) echo "LF will be replaced by CRLF" >"$2".expect ;; + CRLF_LF) echo "CRLF will be replaced by LF" >"$2".expect ;; + '') >"$2".expect ;; *) echo >&2 "Illegal 1": "$1" ; return false ;; esac - grep "will be replaced by" "$2" | sed -e "s/\(.*\) in [^ ]*$/\1/" | uniq >"$2".actual + sed -e "s/^.* \([^ ]* will be replaced by [^ ]*\) .*$/\1/" "$2" | uniq >"$2".actual test_cmp "$2".expect "$2".actual } |