Re: [PATCH v4 09/12] Add several uses of get_object_hash.
- From
brian m. carlson <sandals@crustytoothpaste.net>
- Date
- Nov 20, 2015, 13:00 UTC
- Message-ID
- <20151120130020.GA7459@vauxhall.crustytoothpaste.net>
- In-Reply-To
- <20151120113830.GF11198@sigill.intra.peff.net>
On Fri, Nov 20, 2015 at 06:38:30AM -0500, Jeff King wrote:
Show 18 quoted lines
> On Tue, Nov 10, 2015 at 02:22:27AM +0000, brian m. carlson wrote:
>
> > diff --git a/patch-ids.c b/patch-ids.c
> > index bf81b923..83229a0d 100644
> > --- a/patch-ids.c
> > +++ b/patch-ids.c
> > @@ -8,10 +8,10 @@ static int commit_patch_id(struct commit *commit, struct diff_options *options,
> > unsigned char *sha1)
> > {
> > if (commit->parents)
> > - diff_tree_sha1(commit->parents->item->object.sha1,
> > - commit->object.sha1, "", options);
> > + diff_tree_sha1(get_object_hash(commit->parents->item->object),
> > + get_object_hash(commit->object), "", options);
>
> I haven't looked carefully at this series yet, but while applying I
> noticed that git complained about whitespace here (long run of spaces
> which could be using tabs).I believe that was in the original file, but I didn't fix it. Git doesn't show that by default, IIRC. I probably should have put in a preparatory patch. My apologies.
-- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187