Re: [PATCH v4 1/2] diff-files --raw: show correct post-image of intent-to-add files

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jul 1, 2020, 09:46 UTC
Message-ID: <nycvar.QRO.7.76.6.2007011144410.56@tvgsbejvaqbjf.bet>
In-Reply-To: <xmqqmu4r3to1.fsf@gitster.c.googlers.com>

Hi Junio,

On Thu, 25 Jun 2020, Junio C Hamano wrote:

Show 21 quoted lines

> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
>
> > diff --git a/diff-lib.c b/diff-lib.c
> > index 61812f48c2..25fd2dee19 100644
> > --- a/diff-lib.c
> > +++ b/diff-lib.c
> > @@ -220,8 +220,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
> >  			} else if (revs->diffopt.ita_invisible_in_index &&
> >  				   ce_intent_to_add(ce)) {
> >  				diff_addremove(&revs->diffopt, '+', ce->ce_mode,
> > -					       the_hash_algo->empty_tree, 0,
> > -					       ce->name, 0);
> > +					       &null_oid, 0, ce->name, 0);
>
> This (even if the preimage were correctly using empty_blob) is *so*
> simple a change that it is very surprising that the new test in
> [2/2] passes without any other code change.
>
> It means that difftool was written correctly in the first place,
> right?

Well, it means that difftool does not even consume the OID. Sure, it parses it, but then it ignores it. All it _really_ is interested in is that status flag (`A`), so technically, my fix in 1/2 is not even needed after `sk/diff-files-show-i-t-a-as-new` to let 2/2 pass.

Ciao, Dscho

>
> Nicely done.
>