{"thread":{"id":"15665","subject":"[PATCH] checkout: Do not show local changes when in quiet mode","startedAt":"2008-09-25T08:35:38Z","lastAt":"2008-09-25T08:35:38Z","messageCount":1,"participants":["Jonas Fonseca"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"91564","messageId":"20080925083537.GA10273@diku.dk","threadId":"15665","inReplyTo":null,"subject":"[PATCH] checkout: Do not show local changes when in quiet mode","fromName":"Jonas Fonseca","fromEmail":"fonseca@diku.dk","sentAt":"2008-09-25T08:35:38Z","receivedAt":"2008-09-25T08:35:38Z","isPatch":true,"sender":{"key":"fonseca@diku.dk","avatar":"https://gravatar.com/avatar/f82f3ad698717c51873b020c750a92438c820a24056dc39fe4d07baa10a92264?d=mp&s=160"},"body":"Signed-off-by: Jonas Fonseca <fonseca@diku.dk>\n---\n builtin-checkout.c |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\n I noticed this while using topgit which checkouts out a detached head\n with the -q flag and later does a final checkout, which caused local\n changes to be shown twice.\n\ndiff --git a/builtin-checkout.c b/builtin-checkout.c\nindex 9aeb61d..b572b3b 100644\n--- a/builtin-checkout.c\n+++ b/builtin-checkout.c\n@@ -461,7 +461,7 @@ static int merge_working_tree(struct checkout_opts *opts,\n \t    commit_locked_index(lock_file))\n \t\tdie(\"unable to write new index file\");\n \n-\tif (!opts->force)\n+\tif (!opts->force && !opts->quiet)\n \t\tshow_local_changes(&new->commit->object);\n \n \treturn 0;\n-- \ntg: (47a765d..) jf/checkout-quiet (depends on: next)\n\n-- \nJonas Fonseca\n"}]}