OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'ks/test-readme-phrasofix'
[git-core/git.git]
/
ll-merge.c
diff --git
a/ll-merge.c
b/ll-merge.c
index
9fb855a
..
a6ad2ec
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);
}