{"thread":{"id":"1416","subject":"[PATCH] Fix git-merge-cache -q","startedAt":"2005-08-04T22:31:12Z","lastAt":"2005-08-04T22:31:12Z","messageCount":1,"participants":["Petr Baudis"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"6817","messageId":"20050804223112.GG24479@pasky.ji.cz","threadId":"1416","inReplyTo":null,"subject":"[PATCH] Fix git-merge-cache -q","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-08-04T22:31:12Z","receivedAt":"2005-08-04T22:31:12Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"I'm totally stupid and got it backwards, sorry about that.\ngit-merge-cache -q would mean it's noisy and quiet without any\nparameters.\n\nSigned-off-by: Petr Baudis <pasky@ucw.cz>\n\n---\ncommit 1d86b5cb68dd47b4fced8343945c8860946df5d2\ntree 25c4f9cabd6db8c92ab1b0313093d898c03b2b7a\nparent 04c23173a8120f3bd2ae8af545e7e4f62c505ef0\nauthor Petr Baudis <pasky@suse.cz> Sat, 30 Jul 2005 13:07:03 +0200\ncommitter Petr Baudis <xpasky@machine.sinus.cz> Sat, 30 Jul 2005 13:07:03 +0200\n\n merge-cache.c |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/merge-cache.c b/merge-cache.c\n--- a/merge-cache.c\n+++ b/merge-cache.c\n@@ -30,7 +30,7 @@ static void run_program(void)\n \t\tif (one_shot) {\n \t\t\terr++;\n \t\t} else {\n-\t\t\tif (quiet)\n+\t\t\tif (!quiet)\n \t\t\t\tdie(\"merge program failed\");\n \t\t\texit(1);\n \t\t}\n@@ -129,7 +129,7 @@ int main(int argc, char **argv)\n \t\t}\n \t\tmerge_file(arg);\n \t}\n-\tif (err && quiet)\n+\tif (err && !quiet)\n \t\tdie(\"merge program failed\");\n \treturn err;\n }\n"}]}