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

Merge branch 'ss/blame-textconv-fake-working-tree'

Browse Source 
* ss/blame-textconv-fake-working-tree:
  (squash) test for previous
  blame.c: Properly initialize strbuf after calling, textconv_object()

Conflicts:
	t/t8006-blame-textconv.sh
This commit is contained in:
Junio C Hamano 2011-11-01 15:20:28 -07:00
commit b919f8404a
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/blame.c
View File

@ -2113,8 +2113,10 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt,
switch (st.st_mode & S_IFMT) {
case S_IFREG:
if (DIFF_OPT_TST(opt, ALLOW_TEXTCONV) &&
textconv_object(read_from, mode, null_sha1, &buf.buf, &buf_len))
textconv_object(read_from, mode, null_sha1, &buf.buf, &buf_len)) {
buf.alloc = buf_len;
buf.len = buf_len;
}
else if (strbuf_read_file(&buf, read_from, st.st_size) != st.st_size)
die_errno("cannot open or read '%s'", read_from);
break;

11
t/t8006-blame-textconv.sh
View File

@ -15,6 +15,7 @@ EOF
chmod +x helper
test_expect_success 'setup ' '
echo "bin: test number 0" >zero.bin &&
echo "bin: test 1" >one.bin &&
echo "bin: test number 2" >two.bin &&
if test_have_prereq SYMLINKS; then
@ -43,6 +44,7 @@ test_expect_success 'no filter specified' '
test_expect_success 'setup textconv filters' '
echo "*.bin diff=test" >.gitattributes &&
echo "zero.bin eol=crlf" >>.gitattributes &&
git config diff.test.textconv ./helper &&
git config diff.test.cachetextconv false
'
@ -74,6 +76,15 @@ test_expect_success 'blame --textconv going through revisions' '
test_cmp expected result
'
test_expect_success 'blame --textconv with local changes' '
test_when_finished "git checkout zero.bin" &&
printf "bin: updated number 0\015" >zero.bin &&
git blame --textconv zero.bin >blame &&
expect="(Not Committed Yet ....-..-.. ..:..:.. +0000 1)" &&
expect="$expect converted: updated number 0" &&
expr "$(find_blame <blame)" : "^$expect"
'
test_expect_success 'setup +cachetextconv' '
git config diff.test.cachetextconv true
'