All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Simon Ruderich <simon@ruderich.org>
Cc: git <git@vger.kernel.org>
Subject: Re: [PATCH 1/2] diffcore-pickaxe: respect --no-textconv
Date: Thu, 04 Apr 2013 19:03:58 +0200	[thread overview]
Message-ID: <vpqip42qlc1.fsf@grenoble-inp.fr> (raw)
In-Reply-To: <20130404160359.GA25232@ruderich.org> (Simon Ruderich's message of "Thu, 4 Apr 2013 18:03:59 +0200")

Simon Ruderich <simon@ruderich.org> writes:

> This patch should fix it.

It does.

> --- a/diffcore-pickaxe.c
> +++ b/diffcore-pickaxe.c
> @@ -78,7 +78,6 @@ static void fill_one(struct diff_filespec *one,
>  		     mmfile_t *mf, struct userdiff_driver **textconv)
>  {
>  	if (DIFF_FILE_VALID(one)) {
> -		*textconv = get_textconv(one);
>  		mf->size = fill_textconv(*textconv, one, &mf->ptr);
>  	} else {
>  		memset(mf, 0, sizeof(*mf));

I don't understand why this is needed (not rethorical, I just didn't
investigate), but the rest of the code looks straightforward and
correct.

Thanks,

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

  reply	other threads:[~2013-04-04 17:04 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-04  8:34 [BUG] git log -S not respecting --no-textconv Matthieu Moy
2013-04-04 16:03 ` [PATCH 1/2] diffcore-pickaxe: respect --no-textconv Simon Ruderich
2013-04-04 17:03   ` Matthieu Moy [this message]
2013-04-04 17:43   ` Jeff King
2013-04-04 17:45   ` Junio C Hamano
2013-04-04 17:51     ` Jeff King
2013-04-04 18:10       ` Junio C Hamano
2013-04-04 20:20         ` [PATCH v2 1/3] diffcore-pickaxe: remove unnecessary call to get_textconv() Simon Ruderich
2013-04-04 20:48           ` Junio C Hamano
2013-04-04 21:10             ` Junio C Hamano
2013-04-04 21:11             ` Jeff King
2013-04-04 22:51               ` Junio C Hamano
2013-04-05 13:20             ` Simon Ruderich
2013-04-04 20:21         ` [PATCH v2 2/3] diffcore-pickaxe: remove fill_one() Simon Ruderich
2013-04-05  0:08           ` Jeff King
2013-04-05  4:43             ` Junio C Hamano
2013-04-05  4:45               ` [PATCH 1/3] diffcore-pickaxe: port optimization from has_changes() to diff_grep() Junio C Hamano
2013-04-05  4:45                 ` [PATCH 2/3] diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>" Junio C Hamano
2013-04-05  4:45                 ` [PATCH 3/3] diffcore-pickaxe: unify setup and teardown code between log -S/-G Junio C Hamano
2013-04-05  5:28                   ` Jeff King
2013-04-05  5:43                     ` Junio C Hamano
2013-04-05  5:45                       ` Jeff King
2013-04-05 16:44                         ` Junio C Hamano
2013-04-04 20:21         ` [PATCH v2 3/3] diffcore-pickaxe: respect --no-textconv Simon Ruderich
2013-04-05  7:40           ` Matthieu Moy
2013-04-05 13:16             ` [PATCH v3 " Simon Ruderich
2013-04-05 17:31               ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=vpqip42qlc1.fsf@grenoble-inp.fr \
    --to=matthieu.moy@grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    --cc=simon@ruderich.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.