From: Petr Baudis <pasky@ucw.cz>
Date: Thu, 4 Aug 2005 22:31:12 +0000 (+0200)
Subject: [PATCH] Fix git-merge-cache -q
X-Git-Tag: v0.99.4~28
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b32e986cd7a2b3ab4227d63657ef439786a82024;p=git.git

[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 <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/merge-cache.c b/merge-cache.c
index b2893e6e..744681b2 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;
 }