From: Michael Haggerty <mhagger@alum•mit.edu>
To: Junio C Hamano <gitster@pobox•com>
Cc: Jeff King <peff@peff•net>, Johan Herland <johan@herland•net>,
git@vger•kernel.org
Subject: Re: [PATCH 04/17] builtin_diff_tree(): make it obvious that function wants two entries
Date: Thu, 23 May 2013 09:19:00 +0200 [thread overview]
Message-ID: <519DC2E4.7070102@alum.mit.edu> (raw)
In-Reply-To: <7v8v38p7jx.fsf@alter.siamese.dyndns.org>
On 05/21/2013 07:27 PM, Junio C Hamano wrote:
> Michael Haggerty <mhagger@alum•mit.edu> writes:
>
>> Instead of accepting an array and using exactly two elements from the
>> array, take two single (struct object_array_entry *) arguments.
>>
>> Signed-off-by: Michael Haggerty <mhagger@alum•mit.edu>
>> ---
>> builtin/diff.c | 18 +++++++++---------
>> 1 file changed, 9 insertions(+), 9 deletions(-)
>>
>> diff --git a/builtin/diff.c b/builtin/diff.c
>> index 8c2af6c..ba68c6c 100644
>> --- a/builtin/diff.c
>> +++ b/builtin/diff.c
>> @@ -153,7 +153,8 @@ static int builtin_diff_index(struct rev_info *revs,
>>
>> static int builtin_diff_tree(struct rev_info *revs,
>> int argc, const char **argv,
>> - struct object_array_entry *ent)
>> + struct object_array_entry *ent0,
>> + struct object_array_entry *ent1)
>> {
>> const unsigned char *(sha1[2]);
>> int swap = 0;
>> @@ -161,13 +162,13 @@ static int builtin_diff_tree(struct rev_info *revs,
>> if (argc > 1)
>> usage(builtin_diff_usage);
>>
>> - /* We saw two trees, ent[0] and ent[1].
>> - * if ent[1] is uninteresting, they are swapped
>> + /* We saw two trees, ent0 and ent1.
>> + * if ent1 is uninteresting, they are swapped
>> */
>
> "While you are touching this comment" is a perfect time to fix the
> existing style violation.
Yes. Will fix in next version.
Michael
--
Michael Haggerty
mhagger@alum•mit.edu
http://softwareswirl.blogspot.com/
next prev parent reply other threads:[~2013-05-23 7:19 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-19 20:26 [PATCH 00/17] Remove assumptions about refname lifetimes Michael Haggerty
2013-05-19 20:26 ` [PATCH 01/17] describe: make own copy of refname Michael Haggerty
2013-05-19 20:26 ` [PATCH 02/17] fetch: make own copies of refnames Michael Haggerty
2013-05-19 20:26 ` [PATCH 03/17] add_rev_cmdline(): make a copy of the name argument Michael Haggerty
2013-05-19 20:26 ` [PATCH 04/17] builtin_diff_tree(): make it obvious that function wants two entries Michael Haggerty
2013-05-21 17:27 ` Junio C Hamano
2013-05-23 7:19 ` Michael Haggerty [this message]
2013-05-19 20:27 ` [PATCH 05/17] cmd_diff(): use an object_array for holding trees Michael Haggerty
2013-05-21 17:30 ` Junio C Hamano
2013-05-23 7:21 ` Michael Haggerty
2013-05-19 20:27 ` [PATCH 06/17] cmd_diff(): rename local variable "list" -> "entry" Michael Haggerty
2013-05-19 20:27 ` [PATCH 07/17] cmd_diff(): make it obvious which cases are exclusive of each other Michael Haggerty
2013-05-19 20:27 ` [PATCH 08/17] revision: split some overly-long lines Michael Haggerty
2013-05-21 17:34 ` Junio C Hamano
2013-05-23 6:27 ` Michael Haggerty
2013-05-23 17:08 ` Junio C Hamano
2013-05-19 20:27 ` [PATCH 09/17] gc_boundary(): move the check "alloc <= nr" to caller Michael Haggerty
2013-05-21 17:49 ` Junio C Hamano
2013-05-23 7:09 ` Michael Haggerty
2013-05-23 18:02 ` Junio C Hamano
2013-05-19 20:27 ` [PATCH 10/17] get_revision_internal(): make check less mysterious Michael Haggerty
2013-05-21 17:38 ` Junio C Hamano
2013-05-23 6:39 ` Michael Haggerty
2013-05-19 20:27 ` [PATCH 11/17] object_array: add function object_array_filter() Michael Haggerty
2013-05-19 20:27 ` [PATCH 12/17] object_array_remove_duplicates(): rewrite to reduce copying Michael Haggerty
2013-05-19 20:27 ` [PATCH 13/17] fsck: don't put a void*-shaped peg in a char*-shaped hole Michael Haggerty
2013-05-19 20:27 ` [PATCH 14/17] find_first_merges(): initialize merges variable using initializer Michael Haggerty
2013-05-19 20:27 ` [PATCH 15/17] find_first_merges(): remove unnecessary code Michael Haggerty
2013-05-19 20:27 ` [RFC 16/17] object_array_entry: copy name before storing in name field Michael Haggerty
2013-05-20 10:33 ` Johan Herland
2013-05-20 14:42 ` Michael Haggerty
2013-05-20 16:44 ` Jeff King
2013-05-20 21:34 ` Michael Haggerty
2013-05-19 20:27 ` [RFC 17/17] refs: document the lifetime of the refname passed to each_ref_fn Michael Haggerty
2013-05-20 10:28 ` [PATCH 00/17] Remove assumptions about refname lifetimes Johan Herland
2013-05-20 12:15 ` Michael Haggerty
2013-05-20 16:37 ` Junio C Hamano
2013-05-20 16:59 ` Jeff King
2013-05-20 17:08 ` Johan Herland
2013-05-20 18:03 ` Junio C Hamano
2013-05-20 17:03 ` Johan Herland
2013-05-21 18:39 ` 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=519DC2E4.7070102@alum.mit.edu \
--to=mhagger@alum$(echo .)mit.edu \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=johan@herland$(echo .)net \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox