mirror of
https://github.com/git/git
synced 2024-10-01 06:05:20 +00:00
Merge branch 'en/diffcore-delta-final-line-fix' into maint-2.43
Rename detection logic ignored the final line of a file if it is an incomplete line. * en/diffcore-delta-final-line-fix: diffcore-delta: avoid ignoring final 'line' of file
This commit is contained in:
commit
904ca69428
|
@ -158,6 +158,10 @@ static struct spanhash_top *hash_chars(struct repository *r,
|
||||||
n = 0;
|
n = 0;
|
||||||
accum1 = accum2 = 0;
|
accum1 = accum2 = 0;
|
||||||
}
|
}
|
||||||
|
if (n > 0) {
|
||||||
|
hashval = (accum1 + accum2 * 0x61) % HASHBASE;
|
||||||
|
hash = add_spanhash(hash, hashval, n);
|
||||||
|
}
|
||||||
QSORT(hash->data, (size_t)1ul << hash->alloc_log2, spanhash_cmp);
|
QSORT(hash->data, (size_t)1ul << hash->alloc_log2, spanhash_cmp);
|
||||||
return hash;
|
return hash;
|
||||||
}
|
}
|
||||||
|
|
|
@ -286,4 +286,28 @@ test_expect_success 'basename similarity vs best similarity' '
|
||||||
test_cmp expected actual
|
test_cmp expected actual
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'last line matters too' '
|
||||||
|
{
|
||||||
|
test_write_lines a 0 1 2 3 4 5 6 7 8 9 &&
|
||||||
|
printf "git ignores final up to 63 characters if not newline terminated"
|
||||||
|
} >no-final-lf &&
|
||||||
|
git add no-final-lf &&
|
||||||
|
git commit -m "original version of file with no final newline" &&
|
||||||
|
|
||||||
|
# Change ONLY the first character of the whole file
|
||||||
|
{
|
||||||
|
test_write_lines b 0 1 2 3 4 5 6 7 8 9 &&
|
||||||
|
printf "git ignores final up to 63 characters if not newline terminated"
|
||||||
|
} >no-final-lf &&
|
||||||
|
git add no-final-lf &&
|
||||||
|
git mv no-final-lf still-absent-final-lf &&
|
||||||
|
git commit -a -m "rename no-final-lf -> still-absent-final-lf" &&
|
||||||
|
git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
|
||||||
|
sed -e "s/^R[0-9]* /R /" actual >actual.munged &&
|
||||||
|
cat >expected <<-\EOF &&
|
||||||
|
R no-final-lf still-absent-final-lf
|
||||||
|
EOF
|
||||||
|
test_cmp expected actual.munged
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue