Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
path: document path functions
[gitweb.git]
/
ll-merge.c
diff --git
a/ll-merge.c
b/ll-merge.c
index 9fb855a90030e07e28c1ae9d0994006da22cd4ed..a6ad2ec12dc9c1ece81f120196c81fd259e40eb6 100644
(file)
--- a/
ll-merge.c
+++ b/
ll-merge.c
@@
-154,7
+154,7
@@
static void create_temp(mmfile_t *src, char *path, size_t len)
xsnprintf(path, len, ".merge_file_XXXXXX");
fd = xmkstemp(path);
- if (write_in_full(fd, src->ptr, src->size)
!= src->size
)
+ if (write_in_full(fd, src->ptr, src->size)
< 0
)
die_errno("unable to write temp-file");
close(fd);
}