X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=ll-merge.c;h=2d6b6d6cb1d2bc2d334bf058feb3444e94b5a781;hb=f1f523eae99020d58ad6e7a1ef8187569e15c270;hp=a2c13c4c087f7b4961f0507783d34d19ff4b2921;hpb=7557b3431065bfdaaaa8fa3cab5a67a82fae7348;p=git.git

diff --git a/ll-merge.c b/ll-merge.c
index a2c13c4c0..2d6b6d6cb 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -152,7 +152,7 @@ static void create_temp(mmfile_t *src, char *path)
 	strcpy(path, ".merge_file_XXXXXX");
 	fd = xmkstemp(path);
 	if (write_in_full(fd, src->ptr, src->size) != src->size)
-		die("unable to write temp-file");
+		die_errno("unable to write temp-file");
 	close(fd);
 }
 
@@ -192,10 +192,6 @@ static int ll_ext_merge(const struct ll_merge_driver *fn,
 
 	args[2] = cmd.buf;
 	status = run_command_v_opt(args, 0);
-	if (status < -ERR_RUN_COMMAND_FORK)
-		; /* failure in run-command */
-	else
-		status = -status;
 	fd = open(temp[1], O_RDONLY);
 	if (fd < 0)
 		goto bad;