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

convert: clarify line ending conversion warning

Browse Source 
The warning about converting line endings is extremely confusing. Its
two sentences each use the word "will" without specifying a timeframe,
which makes it sound like both sentences are referring to the same
timeframe. On top of that, it uses the term "original line endings"
without saying whether "original" means LF or CRLF.

Rephrase the warning to be clear about when the line endings will be
changed and what they will be changed to.

On a platform whose native line endings are not CRLF (e.g. Linux), the
"git add" step in the following sequence triggers the warning in
question:

$ git config core.autocrlf true
$ echo 'Hello world!' >hello.txt
$ git add hello.txt
warning: LF will be replaced by CRLF in hello.txt
The file will have its original line endings in your working directory

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alex Henrie 2022-04-07 22:41:54 -06:00 committed by Junio C Hamano
parent faa21c10d4
commit c970d30c2c
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
convert.c
View File

@ -195,9 +195,9 @@ static void check_global_conv_flags_eol(const char *path,
if (conv_flags & CONV_EOL_RNDTRP_DIE) if (conv_flags & CONV_EOL_RNDTRP_DIE)
die(_("CRLF would be replaced by LF in %s"), path); die(_("CRLF would be replaced by LF in %s"), path);
else if (conv_flags & CONV_EOL_RNDTRP_WARN) else if (conv_flags & CONV_EOL_RNDTRP_WARN)
warning(_("CRLF will be replaced by LF in %s.\n" warning(_("in the working copy of '%s', CRLF will be"
"The file will have its original line" " replaced by LF the next time Git touches"
" endings in your working directory"), path); " it"), path);
} else if (old_stats->lonelf && !new_stats->lonelf ) { } else if (old_stats->lonelf && !new_stats->lonelf ) {
/* /*
* CRLFs would be added by checkout * CRLFs would be added by checkout
@ -205,9 +205,9 @@ static void check_global_conv_flags_eol(const char *path,
if (conv_flags & CONV_EOL_RNDTRP_DIE) if (conv_flags & CONV_EOL_RNDTRP_DIE)
die(_("LF would be replaced by CRLF in %s"), path); die(_("LF would be replaced by CRLF in %s"), path);
else if (conv_flags & CONV_EOL_RNDTRP_WARN) else if (conv_flags & CONV_EOL_RNDTRP_WARN)
warning(_("LF will be replaced by CRLF in %s.\n" warning(_("in the working copy of '%s', LF will be"
"The file will have its original line" " replaced by CRLF the next time Git touches"
" endings in your working directory"), path); " it"), path);
} }
} }

8
t/t0027-auto-crlf.sh
View File

@ -77,12 +77,12 @@ create_NNO_MIX_files () {
check_warning () { check_warning () {
case "$1" in case "$1" in
LF_CRLF) echo "warning: LF will be replaced by CRLF" >"$2".expect ;; LF_CRLF) echo "LF will be replaced by CRLF" >"$2".expect ;;
CRLF_LF) echo "warning: CRLF will be replaced by LF" >"$2".expect ;; CRLF_LF) echo "CRLF will be replaced by LF" >"$2".expect ;;
'') >"$2".expect ;; '') >"$2".expect ;;
*) echo >&2 "Illegal 1": "$1" ; return false ;; *) echo >&2 "Illegal 1": "$1" ; return false ;;
esac 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 test_cmp "$2".expect "$2".actual
} }