Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
apply: demonstrate a problem applying svn diffs
[gitweb.git]
/
notes-merge.c
diff --git
a/notes-merge.c
b/notes-merge.c
index c12b354f1003a29c6faf58e7ec970e4ac761812e..01cecbdda36795f74d727dcfab975b913757c349 100644
(file)
--- a/
notes-merge.c
+++ b/
notes-merge.c
@@
-302,7
+302,7
@@
static void write_buf_to_worktree(const struct object_id *obj,
fd = xopen(path, O_WRONLY | O_EXCL | O_CREAT, 0666);
while (size > 0) {
-
long
ret = write_in_full(fd, buf, size);
+
ssize_t
ret = write_in_full(fd, buf, size);
if (ret < 0) {
/* Ignore epipe */
if (errno == EPIPE)