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.
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 int err;
static void run_program(void)
NULL);
die("unable to execute '%s'", pgm);
}
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)
}
static int merge_entry(int pos, const char *path)
int i, force_file = 0;
if (argc < 3)
int i, force_file = 0;
if (argc < 3)
- usage("merge-cache <merge-program> (-a | <filename>*)");
+ usage("merge-cache [-o] <merge-program> (-a | <filename>*)");
- 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, "--")) {
char *arg = argv[i];
if (!force_file && *arg == '-') {
if (!strcmp(arg, "--")) {