development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make merge-cache not fail immediatelly when the merge program

Browse source 
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:
Petr Baudis 2005-04-19 04:16:15 +02:00 committed by Petr Baudis
parent e7d3dd248f
commit 8c59926f5e
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
merge-cache.c
View file

@ -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;
}