From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 25 Sep 2008 08:35:38 +0000 (+0200)
Subject: checkout: Do not show local changes when in quiet mode
X-Git-Tag: v1.6.0.3~63
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7fe4a728a16cf4e873702f8478fa3e28e8ae89ce;p=git.git

checkout: Do not show local changes when in quiet mode

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/builtin-checkout.c b/builtin-checkout.c
index 08c6d8614..c4fc2b2c5 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -328,7 +328,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;