Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
cvsserver: detect early of we are up to date and avoid costly rev-list
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index bac16f577c95937a76738dce5d659cff71bd03ab..87a27e0379c87efc8f04a4cf826f1bc7da242d34 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-517,7
+517,7
@@
static int mkdir_p(const char *path, unsigned long mode)
static void flush_buffer(int fd, const char *buf, unsigned long size)
{
while (size > 0) {
- long ret =
xwrite
(fd, buf, size);
+ long ret =
write_in_full
(fd, buf, size);
if (ret < 0) {
/* Ignore epipe */
if (errno == EPIPE)