From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Johannes Sixt <j6t@kdbg.org>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
git@vger.kernel.org, Elijah Newren <newren@gmail.com>,
Stefan Beller <sbeller@google.com>
Subject: Re: [PATCH 4/8] Rename struct diff_filespec's sha1_valid member.
Date: Tue, 07 Jun 2016 12:14:42 -0700 [thread overview]
Message-ID: <xmqqmvmwq09p.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160607062324.GA29484@sigill.intra.peff.net> (Jeff King's message of "Tue, 7 Jun 2016 02:23:24 -0400")
Jeff King <peff@peff.net> writes:
> On Tue, Jun 07, 2016 at 08:21:26AM +0200, Johannes Sixt wrote:
>
>> > diff --git a/combine-diff.c b/combine-diff.c
>> > index f39be434..a20caa80 100644
>> > --- a/combine-diff.c
>> > +++ b/combine-diff.c
>> > @@ -1269,7 +1269,7 @@ static struct diff_filepair *combined_pair(struct combine_diff_path *p,
>> > pair->one[i].path = p->path;
>> > pair->one[i].mode = p->parent[i].mode;
>> > oidcpy(&pair->one->oid, &p->parent[i].oid);
>> > - pair->one[i].sha1_valid = !is_null_oid(&p->parent[i].oid);
>> > + pair->one->oid_valid = !is_null_oid(&p->parent[i].oid);
>>
>> Is this transformation correct?
>
> Or the oidcpy() above it, which was introduced in patch 3.
Indeed these look wrong.
next prev parent reply other threads:[~2016-06-07 19:14 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-07 0:57 [PATCH 1/8] Add basic Coccinelle transforms brian m. carlson
2016-06-07 0:57 ` [PATCH 2/8] Apply standard object_id Coccinelle transformations brian m. carlson
2016-06-07 0:57 ` [PATCH 3/8] Convert struct diff_filespec to struct object_id brian m. carlson
2016-06-07 0:57 ` [PATCH 4/8] Rename struct diff_filespec's sha1_valid member brian m. carlson
2016-06-07 6:21 ` Johannes Sixt
2016-06-07 6:23 ` Jeff King
2016-06-07 19:14 ` Junio C Hamano [this message]
2016-06-07 23:12 ` brian m. carlson
2016-06-07 0:57 ` [PATCH 5/8] merge-recursive: convert struct stage_data to use object_id brian m. carlson
2016-06-07 0:57 ` [PATCH 6/8] merge-recursive: convert struct merge_file_info to object_id brian m. carlson
2016-06-07 0:57 ` [PATCH 7/8] merge-recursive: convert leaf functions to use struct object_id brian m. carlson
2016-06-07 0:57 ` [PATCH 8/8] merge-recursive: convert merge_recursive_generic to object_id brian m. carlson
2016-06-07 2:28 ` [PATCH 1/8] Add basic Coccinelle transforms Junio C Hamano
2016-06-07 2:31 ` brian m. carlson
2016-06-07 2:54 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqmvmwq09p.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
--cc=sbeller@google.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).