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

convert.c: correct attr_action()

Browse Source 
df747b81 (convert.c: refactor crlf_action, 2016-02-10) introduced a
bug to "git ls-files --eol".

The "text" attribute was shown as "text eol=lf" or "text eol=crlf",
depending on core.autocrlf or core.eol.

Correct this and add test cases in t0027.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Torsten Bögershausen 2016-02-23 18:07:19 +01:00 committed by Junio C Hamano
parent 6e336a530b
commit 817a0c7968
2 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
convert.c
View File

@ -708,7 +708,7 @@ static enum crlf_action git_path_check_crlf(struct git_attr_check *check)
const char *value = check->value; const char *value = check->value;
if (ATTR_TRUE(value)) if (ATTR_TRUE(value))
return text_eol_is_crlf() ? CRLF_TEXT_CRLF : CRLF_TEXT_INPUT; return CRLF_TEXT;
else if (ATTR_FALSE(value)) else if (ATTR_FALSE(value))
return CRLF_BINARY; return CRLF_BINARY;
else if (ATTR_UNSET(value)) else if (ATTR_UNSET(value))
@ -778,20 +778,20 @@ static void convert_attrs(struct conv_attrs *ca, const char *path)
} }
if (!git_check_attr(path, NUM_CONV_ATTRS, ccheck)) { if (!git_check_attr(path, NUM_CONV_ATTRS, ccheck)) {
enum eol eol_attr;
ca->crlf_action = git_path_check_crlf(ccheck + 4); ca->crlf_action = git_path_check_crlf(ccheck + 4);
if (ca->crlf_action == CRLF_UNDEFINED) if (ca->crlf_action == CRLF_UNDEFINED)
ca->crlf_action = git_path_check_crlf(ccheck + 0); ca->crlf_action = git_path_check_crlf(ccheck + 0);
ca->attr_action = ca->crlf_action; ca->attr_action = ca->crlf_action;
ca->ident = git_path_check_ident(ccheck + 1); ca->ident = git_path_check_ident(ccheck + 1);
ca->drv = git_path_check_convert(ccheck + 2); ca->drv = git_path_check_convert(ccheck + 2);
if (ca->crlf_action == CRLF_BINARY) if (ca->crlf_action != CRLF_BINARY) {
return; enum eol eol_attr = git_path_check_eol(ccheck + 3);
eol_attr = git_path_check_eol(ccheck + 3); if (eol_attr == EOL_LF)
if (eol_attr == EOL_LF) ca->crlf_action = CRLF_TEXT_INPUT;
ca->crlf_action = CRLF_TEXT_INPUT; else if (eol_attr == EOL_CRLF)
else if (eol_attr == EOL_CRLF) ca->crlf_action = CRLF_TEXT_CRLF;
ca->crlf_action = CRLF_TEXT_CRLF; }
ca->attr_action = ca->crlf_action;
} else { } else {
ca->drv = NULL; ca->drv = NULL;
ca->crlf_action = CRLF_UNDEFINED; ca->crlf_action = CRLF_UNDEFINED;

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

@ -159,6 +159,25 @@ stats_ascii () {
} }
# contruct the attr/ returned by git ls-files --eol
# Take none (=empty), one or two args
attr_ascii () {
case $1,$2 in
-text,*) echo "-text" ;;
text,) echo "text" ;;
text,lf) echo "text eol=lf" ;;
text,crlf) echo "text eol=crlf" ;;
auto,) echo "text=auto" ;;
auto,lf) echo "text=auto eol=lf" ;;
auto,crlf) echo "text=auto eol=crlf" ;;
lf,) echo "text eol=lf" ;;
crlf,) echo "text eol=crlf" ;;
,) echo "" ;;
*) echo invalid_attr "$1,$2" ;;
esac
}
check_files_in_repo () { check_files_in_repo () {
crlf=$1 crlf=$1
attr=$2 attr=$2
@ -228,15 +247,15 @@ checkout_files () {
test_expect_success "ls-files --eol attr=$attr $ident $aeol core.autocrlf=$crlf core.eol=$ceol" ' test_expect_success "ls-files --eol attr=$attr $ident $aeol core.autocrlf=$crlf core.eol=$ceol" '
test_when_finished "rm expect actual" && test_when_finished "rm expect actual" &&
sort <<-EOF >expect && sort <<-EOF >expect &&
i/crlf w/$(stats_ascii $crlfname) crlf_false_attr__CRLF.txt i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
i/mixed w/$(stats_ascii $lfmixcrlf) crlf_false_attr__CRLF_mix_LF.txt i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
i/lf w/$(stats_ascii $lfname) crlf_false_attr__LF.txt i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
i/-text w/$(stats_ascii $lfmixcr) crlf_false_attr__LF_mix_CR.txt i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
i/-text w/$(stats_ascii $crlfnul) crlf_false_attr__CRLF_nul.txt i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
i/-text w/$(stats_ascii $crlfnul) crlf_false_attr__LF_nul.txt i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
EOF EOF
git ls-files --eol crlf_false_attr__* | git ls-files --eol crlf_false_attr__* |
sed -e "s!attr/[^ ]*!!g" -e "s/ / /g" -e "s/ */ /g" | sed -e "s/ / /g" -e "s/ */ /g" |
sort >actual && sort >actual &&
test_cmp expect actual test_cmp expect actual
' '