development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] Fix git-merge-cache -q

Browse source 
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>
This commit is contained in:
Petr Baudis 2005-08-05 00:31:12 +02:00 committed by Junio C Hamano
parent b50abe8843
commit b32e986cd7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
merge-cache.c
View file

@ -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;
}