X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=merge-cache.c;h=48412330cb950813b37d7254947a3f70a4fd99d8;hb=902d960b382a0cd424618ff4e1316da40e4be2f6;hp=11079b1cda9c50856a636a19bc41204903f1b522;hpb=e2b6a9d0bf9335f24aa8b2be8ff00d3a4ccf6505;p=git.git

diff --git a/merge-cache.c b/merge-cache.c
index 11079b1c..48412330 100644
--- a/merge-cache.c
+++ b/merge-cache.c
@@ -5,6 +5,8 @@
 
 static const char *pgm = NULL;
 static const char *arguments[8];
+static int one_shot;
+static int err;
 
 static void run_program(void)
 {
@@ -24,8 +26,12 @@ static void run_program(void)
 			    NULL);
 		die("unable to execute '%s'", pgm);
 	}
-	if (waitpid(pid, &status, 0) < 0 || !WIFEXITED(status) || WEXITSTATUS(status))
-		die("merge program failed");
+	if (waitpid(pid, &status, 0) < 0 || !WIFEXITED(status) || WEXITSTATUS(status)) {
+		if (one_shot)
+			err++;
+		else
+			die("merge program failed");
+	}
 }
 
 static int merge_entry(int pos, const char *path)
@@ -91,12 +97,17 @@ int main(int argc, char **argv)
 	int i, force_file = 0;
 
 	if (argc < 3)
-		usage("merge-cache <merge-program> (-a | <filename>*)");
+		usage("merge-cache [-o] <merge-program> (-a | <filename>*)");
 
 	read_cache();
 
-	pgm = argv[1];
-	for (i = 2; i < argc; i++) {
+	i = 1;
+	if (!strcmp(argv[1], "-o")) {
+		one_shot = 1;
+		i++;
+	}
+	pgm = argv[i++];
+	for (; i < argc; i++) {
 		char *arg = argv[i];
 		if (!force_file && *arg == '-') {
 			if (!strcmp(arg, "--")) {
@@ -111,5 +122,7 @@ int main(int argc, char **argv)
 		}
 		merge_file(arg);
 	}
+	if (err)
+		die("merge program failed");
 	return 0;
 }