author | Junio C Hamano <gitster@pobox.com> | |
Tue, 1 Nov 2011 22:20:28 +0000 (15:20 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 1 Nov 2011 22:20:28 +0000 (15:20 -0700) |
* 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
(squash) test for previous
blame.c: Properly initialize strbuf after calling, textconv_object()
Conflicts:
t/t8006-blame-textconv.sh
builtin/blame.c | patch | blob | history | |
t/t8006-blame-textconv.sh | patch | blob | history |
diff --git a/builtin/blame.c b/builtin/blame.c
index 26a5d424b8ceb0fd403a492e46e3637fd35068ba..86c0537cbb50c0e5d6169d6d316ac37b5cc5b856 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
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;
index 32ec82ad678d56bbf27f525fc8588b3391d9117d..4ee42f12f0af6bc7e4b072350f88988b85e40cbb 100755 (executable)
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
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
'
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
'