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

diff --git a/merge-cache.c b/merge-cache.c
index 11079b1c..744681b2 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, quiet;
+static int err;
 
 static void run_program(void)
 {
@@ -24,8 +26,15 @@ 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 {
+			if (!quiet)
+				die("merge program failed");
+			exit(1);
+		}
+	}
 }
 
 static int merge_entry(int pos, const char *path)
@@ -33,7 +42,7 @@ static int merge_entry(int pos, const char *path)
 	int found;
 	
 	if (pos >= active_nr)
-		die("merge-cache: %s not in the cache", path);
+		die("git-merge-cache: %s not in the cache", path);
 	arguments[0] = pgm;
 	arguments[1] = "";
 	arguments[2] = "";
@@ -58,7 +67,7 @@ static int merge_entry(int pos, const char *path)
 		arguments[stage + 4] = ownbuf[stage];
 	} while (++pos < active_nr);
 	if (!found)
-		die("merge-cache: %s not in the cache", path);
+		die("git-merge-cache: %s not in the cache", path);
 	run_program();
 	return found;
 }
@@ -91,12 +100,21 @@ int main(int argc, char **argv)
 	int i, force_file = 0;
 
 	if (argc < 3)
-		usage("merge-cache <merge-program> (-a | <filename>*)");
+		usage("git-merge-cache [-o] [-q] <merge-program> (-a | <filename>*)");
 
 	read_cache();
 
-	pgm = argv[1];
-	for (i = 2; i < argc; i++) {
+	i = 1;
+	if (!strcmp(argv[i], "-o")) {
+		one_shot = 1;
+		i++;
+	}
+	if (!strcmp(argv[i], "-q")) {
+		quiet = 1;
+		i++;
+	}
+	pgm = argv[i++];
+	for (; i < argc; i++) {
 		char *arg = argv[i];
 		if (!force_file && *arg == '-') {
 			if (!strcmp(arg, "--")) {
@@ -107,9 +125,11 @@ int main(int argc, char **argv)
 				merge_all();
 				continue;
 			}
-			die("merge-cache: unknown option %s", arg);
+			die("git-merge-cache: unknown option %s", arg);
 		}
 		merge_file(arg);
 	}
-	return 0;
+	if (err && !quiet)
+		die("merge program failed");
+	return err;
 }