summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Baudis <pasky@ucw.cz>2005-05-11 02:44:59 (GMT)
committerPetr Baudis <xpasky@machine.sinus.cz>2005-05-11 02:44:59 (GMT)
commit2a45925180152b3e54248de4d7f69e8cc5c4051f (patch)
tree82375db1dc4f3a63130edb16637f1b0a2f84d150
parentf7ec43ae2257241ef76a69d9d3df031a181f6ebb (diff)
downloadgit-2a45925180152b3e54248de4d7f69e8cc5c4051f.zip
git-2a45925180152b3e54248de4d7f69e8cc5c4051f.tar.gz
git-2a45925180152b3e54248de4d7f69e8cc5c4051f.tar.bz2
git-merge-cache -o does all the automerges in a single shot
When you pass git-merge-cache the -o option, it tries to do all the automatic merges and possibly return error if any of them failed, instead of the default behaviour of failing immediately after the first failed automatic merge. Ported from the Cogito branch - Cogito needs this behaviour.
-rw-r--r--merge-cache.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/merge-cache.c b/merge-cache.c
index b2977cf..4841233 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)
@@ -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("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, "--")) {