From: Petr Baudis <pasky@ucw.cz>
Date: Tue, 19 Apr 2005 02:16:15 +0000 (+0200)
Subject: Make merge-cache not fail immediatelly when the merge program
X-Git-Tag: v0.99~608
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8c59926f5e00082a4cbf1d9f31275917c5f7f001;p=git.git

Make merge-cache not fail immediatelly when the merge program
fails, but go on and return error code at the end. It makes sense
to try to merge everything, then let the user solve the commits
at once.
---

diff --git a/merge-cache.c b/merge-cache.c
index 11079b1cd..b2977cf16 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;
 }