X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=merge-cache.c;h=b2977cf16c3b1f98304bf4b1630947409560e80f;hb=8c59926f5e00082a4cbf1d9f31275917c5f7f001;hp=11079b1cda9c50856a636a19bc41204903f1b522;hpb=e7d3dd248f50501f98b29c917e70bddcf3ea925a;p=git.git

diff --git a/merge-cache.c b/merge-cache.c
index 11079b1c..b2977cf1 100644
--- a/merge-cache.c
+++ b/merge-cache.c
@@ -5,6 +5,7 @@
 
 static const char *pgm = NULL;
 static const char *arguments[8];
+static int err;
 
 static void run_program(void)
 {
@@ -25,7 +26,7 @@ static void run_program(void)
 		die("unable to execute '%s'", pgm);
 	}
 	if (waitpid(pid, &status, 0) < 0 || !WIFEXITED(status) || WEXITSTATUS(status))
-		die("merge program failed");
+		err++;
 }
 
 static int merge_entry(int pos, const char *path)
@@ -111,5 +112,7 @@ int main(int argc, char **argv)
 		}
 		merge_file(arg);
 	}
+	if (err)
+		die("merge program failed");
 	return 0;
 }