merge-recursive: improve handling for rename/rename(2to1) conflicts

diff --git a/http-backend.c b/http-backend.c
index 809ba7d2c49eace9e2e9c4dae348c394dac28209..9e894f197f91ee3565b0f3c618fdb4042e2f229f 100644 (file)
--- a/http-backend.c
+++ b/http-backend.c
@@ -353,7 +353,7 @@ static ssize_t get_content_length(void)
        ssize_t val = -1;
        const char *str = getenv("CONTENT_LENGTH");
 
-       if (str && !git_parse_ssize_t(str, &val))
+       if (str && *str && !git_parse_ssize_t(str, &val))
                die("failed to parse CONTENT_LENGTH: %s", str);
        return val;
 }