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>
Jonas Fonseca committed
Sep 25, 2008 at 10:35 UTC
7fe4a728a16cf4e873702f8478fa3e28e8ae89ce
1 file changed
+1
-1
builtin-checkout.c
+1
-1
@@ -328,7 +328,7 @@ static int merge_working_tree(struct checkout_opts *opts,
328
commit_locked_index(lock_file))
329
die("unable to write new index file");
330
331
- if (!opts->force)
331
+ if (!opts->force && !opts->quiet)
332
show_local_changes(&new->commit->object);
333
334
return 0;