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.
This commit is contained in:
parent
e7d3dd248f
commit
8c59926f5e
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user