From: Jonas Fonseca <fonseca@diku•dk>
To: "Shawn O. Pearce" <spearce@spearce•org>, git@vger•kernel.org
Subject: [PATCH] checkout: Do not show local changes when in quiet mode
Date: Thu, 25 Sep 2008 10:35:38 +0200 [thread overview]
Message-ID: <20080925083537.GA10273@diku.dk> (raw)
Signed-off-by: Jonas Fonseca <fonseca@diku•dk>
---
builtin-checkout.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
I noticed this while using topgit which checkouts out a detached head
with the -q flag and later does a final checkout, which caused local
changes to be shown twice.
diff --git a/builtin-checkout.c b/builtin-checkout.c
index 9aeb61d..b572b3b 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -461,7 +461,7 @@ static int merge_working_tree(struct checkout_opts *opts,
commit_locked_index(lock_file))
die("unable to write new index file");
- if (!opts->force)
+ if (!opts->force && !opts->quiet)
show_local_changes(&new->commit->object);
return 0;
--
tg: (47a765d..) jf/checkout-quiet (depends on: next)
--
Jonas Fonseca
reply other threads:[~2008-09-25 8:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20080925083537.GA10273@diku.dk \
--to=fonseca@diku$(echo .)dk \
--cc=git@vger$(echo .)kernel.org \
--cc=spearce@spearce$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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