projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make merge-cache not fail immediatelly when the merge program
[git.git]
/
merge-cache.c
diff --git
a/merge-cache.c
b/merge-cache.c
index
11079b1
..
b2977cf
100644
(file)
--- a/
merge-cache.c
+++ b/
merge-cache.c
@@
-5,6
+5,7
@@
static const char *pgm = NULL;
static const char *arguments[8];
static const char *pgm = NULL;
static const char *arguments[8];
+static int err;
static void run_program(void)
{
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("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)
}
static int merge_entry(int pos, const char *path)
@@
-111,5
+112,7
@@
int main(int argc, char **argv)
}
merge_file(arg);
}
}
merge_file(arg);
}
+ if (err)
+ die("merge program failed");
return 0;
}
return 0;
}