From: Eric Sunshine <sunshine@sunshineco.com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: Karthik Nayak <karthik.188@gmail.com>,
Git List <git@vger.kernel.org>,
Christian Couder <christian.couder@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v4 3/8] branch: roll show_detached HEAD into regular ref_list
Date: Sun, 13 Sep 2015 14:31:21 -0400 [thread overview]
Message-ID: <CAPig+cR42jzxeeqpVh2sMojSCVD7Xg4RF6TDfTeg0y10o-2TLQ@mail.gmail.com> (raw)
In-Reply-To: <CAPig+cTzEQ=+FKa2j2RbfHv_NP35_vPDq1NZCeek8LX9fJF3aQ@mail.gmail.com>
On Sun, Sep 13, 2015 at 12:46 PM, Eric Sunshine <sunshine@sunshineco.com> wrote:
> On Sun, Sep 13, 2015 at 8:12 AM, Matthieu Moy
> <Matthieu.Moy@grenoble-inp.fr> wrote:
>> Karthik Nayak <karthik.188@gmail.com> writes:
>>
>>> @@ -679,15 +682,20 @@ static int print_ref_list(int kinds, int detached, int verbose, int abbrev, stru
>>> if (verbose)
>>> maxwidth = calc_maxwidth(&ref_list, strlen(remote_prefix));
>>>
>>> - qsort(ref_list.list, ref_list.index, sizeof(struct ref_item), ref_cmp);
>>> + index = ref_list.index;
>>> +
>>> + /* Print detached HEAD before sorting and printing the rest */
>>> + if (detached && (ref_list.list[index - 1].kind == REF_DETACHED_HEAD) &&
>>> + !strcmp(ref_list.list[index - 1].name, head)) {
>>> + print_ref_item(&ref_list.list[index - 1], maxwidth, verbose, abbrev,
>>> + 1, remote_prefix);
>>> + index -= 1;
>>> + }
>>
>> I think Eric already mentionned it, but I don't remember the conclusion
>> and can't find it in the archives. Wouldn't it be cleaner to actually
>> remove the detached head from the array (do "ref_list.index -= 1"
>> instead of "index -= 1", and possibly free() what needs to be freed?
>
> I think Michael Haggerty mentioned something along those lines...
Specifically, I think you're referring to [1] (?).
[1]: http://thread.gmane.org/gmane.comp.version-control.git/276363/focus=276676
next prev parent reply other threads:[~2015-09-13 18:31 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-13 7:23 [PATCH v4 0/8] port the filtering part of branch.c to use ref-filter APIs Karthik Nayak
2015-09-13 7:23 ` [PATCH v4 1/8] branch: refactor width computation Karthik Nayak
2015-09-13 11:51 ` Matthieu Moy
2015-09-13 12:23 ` Karthik Nayak
2015-09-13 12:33 ` Matthieu Moy
2015-09-13 7:23 ` [PATCH v4 2/8] branch: bump get_head_description() to the top Karthik Nayak
2015-09-13 7:23 ` [PATCH v4 3/8] branch: roll show_detached HEAD into regular ref_list Karthik Nayak
2015-09-13 12:12 ` Matthieu Moy
2015-09-13 13:24 ` Karthik Nayak
2015-09-13 16:46 ` Eric Sunshine
2015-09-13 18:31 ` Eric Sunshine [this message]
2015-09-14 14:48 ` Karthik Nayak
2015-09-14 14:54 ` Matthieu Moy
2015-09-14 19:35 ` Junio C Hamano
2015-09-16 6:23 ` Karthik Nayak
2015-09-17 9:47 ` Karthik Nayak
2015-09-17 14:18 ` Matthieu Moy
2015-09-17 15:15 ` Junio C Hamano
2015-09-17 15:43 ` Matthieu Moy
2015-09-17 16:49 ` Junio C Hamano
2015-09-17 17:08 ` Matthieu Moy
2015-09-17 17:21 ` Junio C Hamano
2015-09-17 18:25 ` Karthik Nayak
2015-09-13 7:23 ` [PATCH v4 4/8] branch: move 'current' check down to the presentation layer Karthik Nayak
2015-09-13 12:15 ` Matthieu Moy
2015-09-13 13:22 ` Karthik Nayak
2015-09-13 15:35 ` Karthik Nayak
2015-09-13 7:23 ` [PATCH v4 5/8] branch: drop non-commit error reporting Karthik Nayak
2015-09-14 19:49 ` Junio C Hamano
2015-09-16 6:04 ` Karthik Nayak
2015-09-13 7:23 ` [PATCH v4 6/8] branch.c: use 'ref-filter' data structures Karthik Nayak
2015-09-13 12:26 ` Matthieu Moy
2015-09-13 13:19 ` Karthik Nayak
2015-09-13 17:49 ` Matthieu Moy
2015-09-13 7:23 ` Karthik Nayak
2015-09-13 7:32 ` Karthik Nayak
2015-09-13 7:23 ` [PATCH v4 8/8] branch: add '--points-at' option Karthik Nayak
2015-09-13 7:29 ` [PATCH v4 7/8] branch.c: use 'ref-filter' APIs Karthik Nayak
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=CAPig+cR42jzxeeqpVh2sMojSCVD7Xg4RF6TDfTeg0y10o-2TLQ@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=karthik.188@gmail.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.
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 NNTP newsgroup(s).