From: Duy Nguyen <pclouds@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>, Jeff King <peff@peff.net>
Subject: Re: [PATCH v2 3/3] fetch: reduce duplicate in ref update status lines
Date: Sat, 4 Jun 2016 06:49:15 +0700 [thread overview]
Message-ID: <CACsJy8BiriuKyrP=0RcbFcSC9WSfcfDeKa-GsKosWxOQdpUZ4g@mail.gmail.com> (raw)
In-Reply-To: <xmqqlh2mp5qv.fsf@gitster.mtv.corp.google.com>
On Sat, Jun 4, 2016 at 12:00 AM, Junio C Hamano <gitster@pobox.com> wrote:
>
> Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
>
> > +static int common_suffix_length(const char *a, const char *b)
> > +{
> > + const char *pa = a + strlen(a);
> > + const char *pb = b + strlen(b);
> > + int count = 0;
> > +
> > + while (pa > a && pb > b && pa[-1] == pb[-1]) {
> > + pa--;
> > + pb--;
> > + count++;
> > + }
> > +
> > + /* stick to '/' boundary, do not break in the middle of a word */
> > + while (count) {
> > + if (*pa == '/' ||
> > + (pa == a && pb > b && pb[-1] == '/') ||
> > + (pb == b && pa > a && pa[-1] == '/'))
> > + break;
> > + pa++;
> > + pb++;
> > + count--;
> > + }
> > +
> > + return count;
> > +}
> > +
>
> Why do you need two loops, one going backward from the tail and then
> going forward toward '/'?
I wanted to check something else, then settled for slashes, but the
two loops remained.
> Wouldn't it be sufficient to keep track
> of the last slash you saw in a while scanning backwards? I.e
> something along the lines of:
>
> tail_a = a + strlen(a);
> for (pa = tail_a, pb = b + strlen(b), slash_in_a = NULL;
> a < pa && b < pb && pa[-1] == pb[-1];
> pa--, pb--) {
> if (*pa == '/')
> slash_in_a = pa;
> }
> count = a + strlen(a) - slash_in_a;
>
> perhaps?
Actually, Jeff's suggestion about common prefix makes me realize, why
not reuse diff.c:pprint_rename()? Your {a -> b} idea came from that.
We may need some tweaking there because right now it will not show {
-> origin/}master.
> > diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
> > index 454d896..9a7649c 100755
> > --- a/t/t5510-fetch.sh
> > +++ b/t/t5510-fetch.sh
> > @@ -222,11 +222,11 @@ test_expect_success 'fetch uses remote ref names to describe new refs' '
> > (
> > cd descriptive &&
> > git fetch o 2>actual &&
> > - grep " -> refs/crazyheads/descriptive-branch$" actual |
> > + grep " -> refs/crazyheads/.descriptive-branch$" actual |
> > test_i18ngrep "new branch" &&
> > grep " -> descriptive-tag$" actual |
> > test_i18ngrep "new tag" &&
> > - grep " -> crazy$" actual |
> > + grep " -> .crazy$" actual |
> > test_i18ngrep "new ref"
> > ) &&
>
> These are somewhat cryptic ;-)
Yeah... too lazy to check if } needs to be quoted or not :D
--
Duy
next prev parent reply other threads:[~2016-06-03 23:49 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-22 11:20 [PATCH 0/2] Better ref summary alignment in "git fetch" Nguyễn Thái Ngọc Duy
2016-05-22 11:20 ` [PATCH 1/2] fetch: better alignment in ref summary Nguyễn Thái Ngọc Duy
2016-05-23 0:58 ` Junio C Hamano
2016-05-23 1:59 ` Duy Nguyen
2016-05-26 14:22 ` Marc Branchaud
2016-05-26 16:29 ` Jeff King
2016-05-26 17:42 ` Junio C Hamano
2016-05-26 18:13 ` Marc Branchaud
2016-05-26 19:31 ` Junio C Hamano
2016-05-26 22:13 ` Marc Branchaud
2016-05-26 5:18 ` Jeff King
2016-06-02 13:58 ` Duy Nguyen
2016-06-02 16:16 ` Junio C Hamano
2016-05-22 11:20 ` [PATCH 2/2] fetch: reduce ref column size when there are enough short ref names Nguyễn Thái Ngọc Duy
2016-06-03 11:08 ` [PATCH v2 0/3] Better ref summary alignment in "git fetch" Nguyễn Thái Ngọc Duy
2016-06-03 11:08 ` [PATCH v2 1/3] git-fetch.txt: document fetch output Nguyễn Thái Ngọc Duy
2016-06-03 14:33 ` Marc Branchaud
2016-06-03 16:55 ` Jeff King
2016-06-03 11:08 ` [PATCH v2 2/3] fetch: refactor ref update status formatting code Nguyễn Thái Ngọc Duy
2016-06-03 16:48 ` Junio C Hamano
2016-06-03 11:08 ` [PATCH v2 3/3] fetch: reduce duplicate in ref update status lines Nguyễn Thái Ngọc Duy
2016-06-03 14:53 ` Marc Branchaud
2016-06-03 17:04 ` Junio C Hamano
2016-06-03 20:00 ` Marc Branchaud
2016-06-03 20:53 ` Junio C Hamano
2016-06-04 3:11 ` Duy Nguyen
2016-06-04 0:31 ` Duy Nguyen
2016-06-04 16:30 ` Junio C Hamano
2016-06-05 3:15 ` Duy Nguyen
2016-06-03 17:00 ` Junio C Hamano
2016-06-03 23:49 ` Duy Nguyen [this message]
2016-06-03 17:06 ` Jeff King
2016-06-03 23:52 ` Duy Nguyen
2016-06-04 4:53 ` Junio C Hamano
2016-06-03 17:00 ` [PATCH v2 0/3] Better ref summary alignment in "git fetch" Jeff King
2016-06-03 17:37 ` Junio C Hamano
2016-06-05 3:11 ` [PATCH v3 0/6] " Nguyễn Thái Ngọc Duy
2016-06-05 3:11 ` [PATCH v3 1/6] git-fetch.txt: document fetch output Nguyễn Thái Ngọc Duy
2016-06-06 14:24 ` Marc Branchaud
2016-06-05 3:11 ` [PATCH v3 2/6] fetch: refactor ref update status formatting code Nguyễn Thái Ngọc Duy
2016-06-05 3:11 ` [PATCH v3 3/6] fetch: change flag code for displaying tag update and deleted ref Nguyễn Thái Ngọc Duy
2016-06-05 3:11 ` [PATCH v3 4/6] fetch: align all "remote -> local" output Nguyễn Thái Ngọc Duy
2016-06-05 3:11 ` [PATCH v3 5/6] fetch: reduce duplicate in ref update status lines with { -> } Nguyễn Thái Ngọc Duy
2016-06-05 3:11 ` [PATCH v3 6/6] fetch: reduce duplicate in ref update status lines with placeholder Nguyễn Thái Ngọc Duy
2016-06-26 5:58 ` [PATCH v4 0/5] Better ref summary alignment in "git fetch" Nguyễn Thái Ngọc Duy
2016-06-26 5:58 ` [PATCH v4 1/5] git-fetch.txt: document fetch output Nguyễn Thái Ngọc Duy
2016-07-04 14:07 ` Jakub Narębski
2016-07-04 15:17 ` Duy Nguyen
2016-07-04 15:25 ` Jakub Narębski
2016-07-04 15:52 ` Duy Nguyen
2016-06-26 5:58 ` [PATCH v4 2/5] fetch: refactor ref update status formatting code Nguyễn Thái Ngọc Duy
2016-06-26 5:58 ` [PATCH v4 3/5] fetch: change flag code for displaying tag update and deleted ref Nguyễn Thái Ngọc Duy
2016-06-26 5:58 ` [PATCH v4 4/5] fetch: align all "remote -> local" output Nguyễn Thái Ngọc Duy
2016-06-26 5:58 ` [PATCH v4 5/5] fetch: reduce duplicate in ref update status lines with placeholder Nguyễn Thái Ngọc Duy
2016-06-27 4:33 ` Eric Sunshine
2016-06-27 5:42 ` Duy Nguyen
2016-06-27 15:31 ` Junio C Hamano
2016-06-27 18:43 ` [PATCH v4 0/5] Better ref summary alignment in "git fetch" Jeff King
2016-06-27 19:27 ` Duy Nguyen
2016-06-30 16:16 ` Duy Nguyen
2016-07-01 6:09 ` Jeff King
2016-07-01 16:03 ` [PATCH v5 " Nguyễn Thái Ngọc Duy
2016-07-01 16:03 ` [PATCH v5 1/5] git-fetch.txt: document fetch output Nguyễn Thái Ngọc Duy
2016-07-01 16:03 ` [PATCH v5 2/5] fetch: refactor ref update status formatting code Nguyễn Thái Ngọc Duy
2016-07-01 16:03 ` [PATCH v5 3/5] fetch: change flag code for displaying tag update and deleted ref Nguyễn Thái Ngọc Duy
2016-07-01 16:03 ` [PATCH v5 4/5] fetch: align all "remote -> local" output Nguyễn Thái Ngọc Duy
2016-07-01 16:03 ` [PATCH v5 5/5] fetch: reduce duplicate in ref update status lines with placeholder Nguyễn Thái Ngọc Duy
2016-07-01 23:21 ` [PATCH v5 0/5] Better ref summary alignment in "git fetch" Junio C Hamano
2016-07-02 4:39 ` Duy Nguyen
2016-07-04 13:17 ` Marc Branchaud
2016-07-04 15:08 ` Duy Nguyen
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='CACsJy8BiriuKyrP=0RcbFcSC9WSfcfDeKa-GsKosWxOQdpUZ4g@mail.gmail.com' \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).