- if (waitpid(pid, &status, 0) < 0 || !WIFEXITED(status) || WEXITSTATUS(status))
- die("merge program failed");
-}
-
-static char *create_temp_file(int stage, unsigned char *sha1)
-{
- static char template[4][50];
- char *path = template[stage];
- void *buf;
- char type[100];
- unsigned long size;
- int fd;
-
- buf = read_sha1_file(sha1, type, &size);
- if (!buf || strcmp(type, "blob"))
- die("unable to read blob object %s", sha1_to_hex(sha1));
-
- strcpy(path, ".merge_file_XXXXXX");
- fd = mkstemp(path);
- if (fd < 0)
- die("unable to create temp-file");
- if (write(fd, buf, size) != size)
- die("unable to write temp-file");
- close(fd);
- return path;
+ if (waitpid(pid, &status, 0) < 0 || !WIFEXITED(status) || WEXITSTATUS(status)) {
+ if (one_shot) {
+ err++;
+ } else {
+ if (!quiet)
+ die("merge program failed");
+ exit(1);
+ }
+ }