Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
[gitweb.git]
/
combine-diff.c
diff --git
a/combine-diff.c
b/combine-diff.c
index cff9c5dc426cae9bd517614e00739edc4b40d635..ea3ca5f950561a92fdd3be1a4ee4bbd726656118 100644
(file)
--- a/
combine-diff.c
+++ b/
combine-diff.c
@@
-714,7
+714,7
@@
static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
result_size = len;
result = xmalloc(len + 1);
while (sz < len) {
-
in
t done = xread(fd, result+sz, len-sz);
+
ssize_
t done = xread(fd, result+sz, len-sz);
if (done == 0)
break;
if (done < 0)