Re: [PATCH] Teach core.autocrlf to 'git blame'
- From
Marius Storm-Olsen <marius@trolltech.com>
- Date
- Oct 17, 2007, 10:57 UTC
- Message-ID
- <4715EAAB.3020705@trolltech.com>
- In-Reply-To
- <1191586411-7436-1-git-send-email-marius@trolltech.com>
Just a reminder of this one, as I didn't see it any "What's in" reports, nor your http://repo.or.cz/w/git/spearce.git repo. (It's normal git.git patch, not an msysgit patch :-)
--
.marius
Marius Storm-Olsen said the following on 05.10.2007 14:13:
> Pass the fake commit through convert_to_git, so that the
> file is adjusted for local line-ending convention.
>
> Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
> ---
> Added missing signoff in the previous mail.
>
> builtin-blame.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/builtin-blame.c b/builtin-blame.c
> index e3112a2..8432b82 100644
> --- a/builtin-blame.c
> +++ b/builtin-blame.c
> @@ -2059,6 +2059,7 @@ static struct commit *fake_working_tree_commit(const char *path, const char *con
> if (strbuf_read(&buf, 0, 0) < 0)
> die("read error %s from stdin", strerror(errno));
> }
> + convert_to_git(path, buf.buf, buf.len, &buf);
> origin->file.ptr = buf.buf;
> origin->file.size = buf.len;
> pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_sha1);