diff options
| author |  Petr Baudis <pasky@ucw.cz> | 2005-08-05 00:31:12 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-08-05 13:53:17 -0700 |
| commit | b32e986cd7a2b3ab4227d63657ef439786a82024 (patch) | |
| tree | 665af2ffadd7ee4b9e0ec3606c6b24070f2046a1 | |
| parent | git-applymbox: allow retrying after fixing up. (diff) | |
| download | tgif-b32e986cd7a2b3ab4227d63657ef439786a82024.tar.xz | |
[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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-cache.c b/merge-cache.c index b2893e6e2d..744681b24f 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; } |