mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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.
This commit is contained in:
parent
f7ec43ae22
commit
2a45925180
|
@ -5,6 +5,7 @@
|
||||||
|
|
||||||
static const char *pgm = NULL;
|
static const char *pgm = NULL;
|
||||||
static const char *arguments[8];
|
static const char *arguments[8];
|
||||||
|
static int one_shot;
|
||||||
static int err;
|
static int err;
|
||||||
|
|
||||||
static void run_program(void)
|
static void run_program(void)
|
||||||
|
@ -25,8 +26,12 @@ static void run_program(void)
|
||||||
NULL);
|
NULL);
|
||||||
die("unable to execute '%s'", pgm);
|
die("unable to execute '%s'", pgm);
|
||||||
}
|
}
|
||||||
if (waitpid(pid, &status, 0) < 0 || !WIFEXITED(status) || WEXITSTATUS(status))
|
if (waitpid(pid, &status, 0) < 0 || !WIFEXITED(status) || WEXITSTATUS(status)) {
|
||||||
|
if (one_shot)
|
||||||
err++;
|
err++;
|
||||||
|
else
|
||||||
|
die("merge program failed");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int merge_entry(int pos, const char *path)
|
static int merge_entry(int pos, const char *path)
|
||||||
|
@ -92,12 +97,17 @@ int main(int argc, char **argv)
|
||||||
int i, force_file = 0;
|
int i, force_file = 0;
|
||||||
|
|
||||||
if (argc < 3)
|
if (argc < 3)
|
||||||
usage("merge-cache <merge-program> (-a | <filename>*)");
|
usage("merge-cache [-o] <merge-program> (-a | <filename>*)");
|
||||||
|
|
||||||
read_cache();
|
read_cache();
|
||||||
|
|
||||||
pgm = argv[1];
|
i = 1;
|
||||||
for (i = 2; i < argc; i++) {
|
if (!strcmp(argv[1], "-o")) {
|
||||||
|
one_shot = 1;
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
pgm = argv[i++];
|
||||||
|
for (; i < argc; i++) {
|
||||||
char *arg = argv[i];
|
char *arg = argv[i];
|
||||||
if (!force_file && *arg == '-') {
|
if (!force_file && *arg == '-') {
|
||||||
if (!strcmp(arg, "--")) {
|
if (!strcmp(arg, "--")) {
|
||||||
|
|
Loading…
Reference in a new issue