[PATCH] Adjust git-merge-recursive.py for the new tool names.

diff --git a/read-cache.c b/read-cache.c
index ced597318e783ab08b73c88f8b724be51f3b3dec..6eff4c8401b820b001a3ed48e8086c4cf1cd8f5c 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -462,6 +462,13 @@ static int ce_flush(SHA_CTX *context, int fd)
                SHA1_Update(context, write_buffer, left);
        }
 
+       /* Flush first if not enough space for SHA1 signature */
+       if (left + 20 > WRITE_BUFFER_SIZE) {
+               if (write(fd, write_buffer, left) != left)
+                       return -1;
+               left = 0;
+       }
+
        /* Append the SHA1 signature at the end */
        SHA1_Final(write_buffer + left, context);
        left += 20;