combine-diff: extend --cc logic to Octopus.

diff --git a/cat-file.c b/cat-file.c
index 7594108c6e5f7d8830c7b5ca6f45951b8b4bcc23..96d66b43043ee1e2381bfb80bb2bc1c7063ecc38 100644 (file)
--- a/cat-file.c
+++ b/cat-file.c
@@ -55,10 +55,8 @@ int main(int argc, char **argv)
                die("git-cat-file %s: bad file", argv[2]);
 
        while (size > 0) {
-               long ret = write(1, buf, size);
+               long ret = xwrite(1, buf, size);
                if (ret < 0) {
-                       if (errno == EAGAIN)
-                               continue;
                        /* Ignore epipe */
                        if (errno == EPIPE)
                                break;