Re: [PATCH v4 5/5] fetch: reduce duplicate in ref update status lines with placeholder
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Jun 27, 2016, 04:33 UTC
- Message-ID
- <CAPig+cT=BAuAbEmS5G1v2yGNczA+-WvW0bBZz_hrLcYi0bpO4g@mail.gmail.com>
- In-Reply-To
- <20160626055810.26960-6-pclouds@gmail.com>
On Sun, Jun 26, 2016 at 1:58 AM, Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:
Show 11 quoted lines
> In the "remote -> local" line, if either ref is a substring of the > other, the common part in the other string is replaced with "$". For > example > > abc -> origin/abc > refs/pull/123/head -> pull/123 > > become > > abc -> origin/$ > refs/$/head -> pull/123
Bikeshedding...
I think I recall in an earlier iteration that you asked for opinions about '$', but don't recall if there were responses. Have you considered '*' rather than '$'?
In my brain, at least, '$' is associated so strongly with regex that "origin/$" is interpreted automatically as anchoring "origin/" at the end of string, and "refs/$/head" just feels weird.
On the other hand, given the familiarity of shell globbing, "origin/*" and "refs/*/head" feel quite natural and intuitive.
Show 7 quoted lines
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> > --- > diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt > @@ -116,6 +116,11 @@ representing the status of a single ref. Each line is of the form: > +In compact output mode, if either entire `<from>` or `<to>` is found > +in the other string, it will be substituted with `$` in the other > +string. or example, `master -> origin/master` becomes
s/or/For/
> +`master -> origin/$`.