tbo...@web.de writes: > This fix is completely independent of the rest of the series, > so break out 6/7 from tb/safe-crlf-output.
Sounds sensible. It is somewhat sad and strange that we need to rely on what is in the index to show the current working tree state, but this makes the things more consistent. Will queue. Thanks. > builtin/blame.c | 1 + > t/t8003-blame-corner-cases.sh | 14 ++++++++++++++ > 2 files changed, 15 insertions(+) > > diff --git a/builtin/blame.c b/builtin/blame.c > index e982fb8..21f42b0 100644 > --- a/builtin/blame.c > +++ b/builtin/blame.c > @@ -2307,6 +2307,7 @@ static struct commit *fake_working_tree_commit(struct > diff_options *opt, > unsigned mode; > struct strbuf msg = STRBUF_INIT; > > + read_cache(); > time(&now); > commit = alloc_commit_node(); > commit->object.parsed = 1; > diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh > index 6568429..a9b266f 100755 > --- a/t/t8003-blame-corner-cases.sh > +++ b/t/t8003-blame-corner-cases.sh > @@ -212,4 +212,18 @@ test_expect_success 'blame file with CRLF attributes > text' ' > grep "A U Thor" actual > ' > > +test_expect_success 'blame file with CRLF core.autocrlf=true' ' > + git config core.autocrlf false && > + printf "testcase\r\n" >crlfinrepo && > + >.gitattributes && > + git add crlfinrepo && > + git commit -m "add crlfinrepo" && > + git config core.autocrlf true && > + mv crlfinrepo tmp && > + git checkout crlfinrepo && > + rm tmp && > + git blame crlfinrepo >actual && > + grep "A U Thor" actual > +' > + > test_done -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
