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>
This commit is contained in:
Jonas Fonseca 2008-09-25 10:35:38 +02:00 committed by Shawn O. Pearce
parent 85cf643f1b
commit 7fe4a728a1

View File

@ -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;