Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
---
builtin-checkout.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
I noticed this while using topgit which checkouts out a detached head
with the -q flag and later does a final checkout, which caused local
changes to be shown twice.
Show changes to builtin-checkout.c +1 −1
diff --git a/builtin-checkout.c b/builtin-checkout.c
index 9aeb61d..b572b3b 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -461,7 +461,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;
--
tg: (47a765d..) jf/checkout-quiet (depends on: next)
--
Jonas Fonseca
Jonas Fonseca