From 7fe4a728a16cf4e873702f8478fa3e28e8ae89ce Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Thu, 25 Sep 2008 10:35:38 +0200 Subject: checkout: Do not show local changes when in quiet mode Signed-off-by: Jonas Fonseca Signed-off-by: Shawn O. Pearce --- builtin-checkout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin-checkout.c b/builtin-checkout.c index 08c6d8614a..c4fc2b2c56 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; -- cgit v1.2.3