Browse Source

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>
maint
Jonas Fonseca 17 years ago committed by Shawn O. Pearce
parent
commit
7fe4a728a1
  1. 2
      builtin-checkout.c

2
builtin-checkout.c

@ -328,7 +328,7 @@ static int merge_working_tree(struct checkout_opts *opts, @@ -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;

Loading…
Cancel
Save