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

diff --git a/merge-cache.c b/merge-cache.c
index b2977cf1..37c72d26 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 one_shot;
 static int err;
 
 static void run_program(void)
@@ -25,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))
-		err++;
+	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)
@@ -34,7 +39,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] = "";
@@ -59,7 +64,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;
 }
@@ -92,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("git-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, "--")) {
@@ -108,7 +118,7 @@ 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);
 	}