From b32e986cd7a2b3ab4227d63657ef439786a82024 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 5 Aug 2005 00:31:12 +0200 Subject: [PATCH] [PATCH] Fix git-merge-cache -q I'm totally stupid and got it backwards, sorry about that. git-merge-cache -q would mean it's noisy and quiet without any parameters. Signed-off-by: Petr Baudis Signed-off-by: Junio C Hamano --- merge-cache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/merge-cache.c b/merge-cache.c index b2893e6e2..744681b24 100644 --- a/merge-cache.c +++ b/merge-cache.c @@ -30,7 +30,7 @@ static void run_program(void) if (one_shot) { err++; } else { - if (quiet) + if (!quiet) die("merge program failed"); exit(1); } @@ -129,7 +129,7 @@ int main(int argc, char **argv) } merge_file(arg); } - if (err && quiet) + if (err && !quiet) die("merge program failed"); return err; } -- 2.26.2