From: Junio C Hamano <gitster@pobox.com>
To: Olivier Marin <dkr+ml.git@free.fr>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
"Shawn O. Pearce" <spearce@spearce.org>,
git@vger.kernel.org, Olivier Marin <dkr@freesurf.fr>
Subject: Re: [PATCH 3/4] remote prune: print the list of pruned branches
Date: Thu, 12 Jun 2008 00:00:41 -0700 [thread overview]
Message-ID: <7v63sf9lye.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1213109495-6974-1-git-send-email-dkr+ml.git@free.fr> (Olivier Marin's message of "Tue, 10 Jun 2008 16:51:35 +0200")
Olivier Marin <dkr+ml.git@free.fr> writes:
> diff --git a/builtin-remote.c b/builtin-remote.c
> index 745a4ee..851bdde 100644
> --- a/builtin-remote.c
> +++ b/builtin-remote.c
> ...
> + printf("Pruning %s\n", *argv);
> + if (states.stale.nr)
> + printf("From: %s\n", states.remote->url[0]);
Thanks. I've queued the series (with minor fixups and rewording) to
'next' already, hoping that we can merge this fix to 'master' before
1.5.6.
But I am very tempted to also apply the following on top. Thoughts?
-- >8 --
[PATCH] "remote prune": be quiet when there is nothing to prune
The previous commit made it always say "Pruning $remote" but reported the
URL only when there is something to prune. Make it consistent by not
saying anything at all when there is nothing to prune.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin-remote.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/builtin-remote.c b/builtin-remote.c
index 4b00cf9..145dd85 100644
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -560,12 +560,13 @@ static int prune(int argc, const char **argv)
get_remote_ref_states(*argv, &states, 1);
- printf("Pruning %s\n", *argv);
- if (states.stale.nr)
+ if (states.stale.nr) {
+ printf("Pruning %s\n", *argv);
printf("URL: %s\n",
states.remote->url_nr
? states.remote->url[0]
: "(no URL)");
+ }
for (i = 0; i < states.stale.nr; i++) {
const char *refname = states.stale.items[i].util;
--
1.5.6.rc2.26.g8c37
next prev parent reply other threads:[~2008-06-12 7:01 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-08 0:54 remote show/prune: strange -n(--dry-run) option Olivier Marin
2008-06-08 11:03 ` [PATCH] Documentation/git-remote.txt: remove description for useless -n option Olivier Marin
2008-06-08 12:22 ` dkr+ml.git
2008-06-08 20:27 ` Junio C Hamano
2008-06-09 0:43 ` Olivier Marin
2008-06-09 0:48 ` [PATCH] remote show: fix the " Olivier Marin
2008-06-09 1:16 ` Johannes Schindelin
2008-06-09 2:06 ` Olivier Marin
2008-06-09 2:35 ` Johannes Schindelin
2008-06-09 4:16 ` Olivier Marin
2008-06-09 4:53 ` Johannes Schindelin
2008-06-09 14:22 ` Olivier Marin
2008-06-09 15:43 ` Olivier Marin
2008-06-09 16:31 ` Johannes Schindelin
2008-06-09 15:58 ` [PATCH v2] " Olivier Marin
2008-06-09 16:35 ` Johannes Schindelin
2008-06-09 16:58 ` Olivier Marin
2008-06-09 17:56 ` Johannes Schindelin
2008-06-09 18:37 ` Olivier Marin
2008-06-09 20:11 ` [PATCH] builtin-remote: make reuse of code easier by not die()ing Johannes Schindelin
2008-06-09 20:43 ` Olivier Marin
2008-06-10 1:10 ` [PATCH v2] remote show: fix the -n option Junio C Hamano
2008-06-10 1:19 ` Shawn O. Pearce
2008-06-10 2:39 ` Johannes Schindelin
2008-06-10 14:50 ` [PATCH 0/4] remote show/prune improvement Olivier Marin
2008-06-10 14:51 ` [PATCH 1/4] remote show: fix the -n option Olivier Marin
2008-06-10 14:51 ` [PATCH 2/4] builtin-remote: split show_or_prune() in two separate functions Olivier Marin
2008-06-10 14:51 ` [PATCH 3/4] remote prune: print the list of pruned branches Olivier Marin
2008-06-12 7:00 ` Junio C Hamano [this message]
2008-06-12 11:07 ` Olivier Marin
2008-06-10 14:51 ` [PATCH 4/4] remote show: list tracked remote branches with -n Olivier Marin
2008-06-10 19:12 ` Junio C Hamano
2008-06-10 22:54 ` [PATCH v2 " Olivier Marin
2008-06-10 15:09 ` [PATCH 0/4] remote show/prune improvement Jakub Narebski
2008-06-10 16:10 ` Olivier Marin
2008-06-10 17:11 ` Jakub Narebski
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=7v63sf9lye.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=dkr+ml.git@free.fr \
--cc=dkr@freesurf.fr \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
/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).