Subject: [PATCH] checkout: Do not show local changes when in quiet mode

From: Jonas Fonseca <[email-masked]>
Date: Thu, 25 Sep 2008 10:35:38 +0200

Signed-off-by: Jonas Fonseca <[email-masked]>
---
 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