diffcore-rename: fall back to -C when -C -C busts the rename limit

diff --git a/transport-helper.c b/transport-helper.c
index 8866adf08898f5855dd1dea1db4286021ffb880c..5846b55875f6e568711b2f90726bb6608aaf4e73 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -76,7 +76,7 @@ static void write_constant(int fd, const char *str)
                die_errno("Full write to remote helper failed");
 }
 
-const char *remove_ext_force(const char *url)
+static const char *remove_ext_force(const char *url)
 {
        if (url) {
                const char *colon = strchr(url, ':');
@@ -972,7 +972,7 @@ static int udt_do_read(struct unidirectional_transfer *t)
  */
 static int udt_do_write(struct unidirectional_transfer *t)
 {
-       size_t bytes;
+       ssize_t bytes;
 
        if (t->bufuse == 0)
                return 0;       /* Nothing to write. */