From: Santi <sbejar@gmail.com>
To: "Junio C Hamano" <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 5/5] fetch: Clean output
Date: Sat, 30 Sep 2006 11:42:33 +0200 [thread overview]
Message-ID: <8aa486160609300242i6f52ee90o235e668a5d865fb7@mail.gmail.com> (raw)
In-Reply-To: <7vpsdehzcs.fsf@assigned-by-dhcp.cox.net>
2006/9/30, Junio C Hamano <junkio@cox.net>:
> Santi Béjar <sbejar@gmail.com> writes:
>
> > Do not show duplicated remote branch information and reformat the output as:
> >
> > $ git fetch -v # the committish lines for the -v.
> > * refs/heads/origin: fast forward to remote branch 'master' of ../git/
> > 1ad7a06..bc1a580
> > committish: bc1a580
>
> I am not quite sure about this --- it is not obvious what these
> two numbers represent anymore. Also I think the last line
> outlived its usefulness (99% of the time refs are committish, so
> noting exception is good but otherwise it is not interesting).
I agree in the case of updating a ref, but I would keep it otherwise
(and even in this case only when -v is given).
>
> I know you opted for minimum patch, but it might be a good time
> to polish the wording a bit while we are touching the general
> vicinity of the code.
>
> How about saying something like:
>
> * refs/heads/origin: fast forward to remote branch 'master' of ../git/
> old..new = 1ad7a06..bc1a580
I like it.
>
> > * refs/heads/pu: does not fast forward to remote branch 'pu' of ../git/;
> > 7c733a8...5faa935
> > not updating.
> > forcing update.
> > committish: 5faa935
>
> This is even more confusing. Perhaps we would want to have two
> cases, depending on --force (and +).
Sorry, it was from two copy'n'paste. I did it in a new repository
(without the +), then it stoped at this point (I suppose to force the
user to solve the problem). Then I put the + and did the copy'n'paste
again without deleting this extra line.
>
> * refs/heads/pu: does not fast forward to remote branch 'pu' of ../git/;
> but forcing update anyway. old...new = 7c733a8...5faa935
With the old...new in a new line?
So at the end, something like this output?
$ git fetch -v # the committish lines for the -v.
* refs/heads/origin: fast forward to remote branch 'master' of ../git/
old..new: 1ad7a06..bc1a580
* refs/heads/pu: does not fast forward to remote branch 'pu' of ../git/
old...new: 7c733a8...5faa935
forcing update.
* refs/heads/next: same as remote branch 'origin/next' of ../git/
committish: ce47b9f
...
* refs/tags/v1.4.2-rc4: storing tag 'v1.4.2-rc4' of ../git/
committish: 8c7a107
$ git fetch -v origin refs/heads/master
* committish: 695dffe
branch 'master' of ../git/
Santi
next prev parent reply other threads:[~2006-09-30 9:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-29 18:05 [PATCH 0/5] fetch & co: misc output cleanup Santi Béjar
2006-09-29 18:05 ` [PATCH 1/5] fetch: Reset remote refs list each time fetch_main is called Santi Béjar
2006-09-29 18:06 ` [PATCH 2/5] fetch & co: Use "hash1..hash2" instead of "from hash1 to hash2" Santi Béjar
2006-09-29 18:06 ` [PATCH 3/5] fetch & co: Use short sha1 in the output Santi Béjar
2006-09-29 18:07 ` [PATCH 4/5] fetch: Add output for the not fast forward case Santi Béjar
2006-09-29 18:08 ` [PATCH 5/5] fetch: Clean output Santi Béjar
2006-09-30 2:17 ` Junio C Hamano
2006-09-30 9:42 ` Santi [this message]
2006-09-30 10:37 ` Junio C Hamano
2006-09-29 18:54 ` [PATCH 0/5] fetch & co: misc output cleanup A Large Angry SCM
2006-09-29 20:48 ` Santi
2006-09-29 21:27 ` 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=8aa486160609300242i6f52ee90o235e668a5d865fb7@mail.gmail.com \
--to=sbejar@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.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.
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).