summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Baudis <pasky@ucw.cz>2005-08-04 22:31:12 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-05 20:53:17 (GMT)
commitb32e986cd7a2b3ab4227d63657ef439786a82024 (patch)
tree665af2ffadd7ee4b9e0ec3606c6b24070f2046a1
parentb50abe8843006e9856c633b5abeb4eab53b46629 (diff)
downloadgit-b32e986cd7a2b3ab4227d63657ef439786a82024.zip
git-b32e986cd7a2b3ab4227d63657ef439786a82024.tar.gz
git-b32e986cd7a2b3ab4227d63657ef439786a82024.tar.bz2
[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>
-rw-r--r--merge-cache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-cache.c b/merge-cache.c
index b2893e6..744681b 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;
}