Merge branch 'master' into cc/trace

[git.git] / builtin-upload-tar.c

diff --git a/builtin-upload-tar.c b/builtin-upload-tar.c
index d4fa7b56c39f03e8b48d513f967d89d4031bacb2..06a945a4b16b1b604847527fbac3aca3c7fa3a73 100644 (file)
--- a/builtin-upload-tar.c
+++ b/builtin-upload-tar.c
@@ -15,7 +15,7 @@ static int nak(const char *reason)
        return 1;
 }
 
-int cmd_upload_tar(int argc, const char **argv, char **envp)
+int cmd_upload_tar(int argc, const char **argv, const char *prefix)
 {
        int len;
        const char *dir = argv[1];
@@ -53,7 +53,7 @@ int cmd_upload_tar(int argc, const char **argv, char **envp)
                        return nak("expected (optional) base");
                if (buf[len-1] == '\n')
                        buf[--len] = 0;
-               base = strdup(buf + 5);
+               base = xstrdup(buf + 5);
                len = packet_read_line(0, buf, sizeof(buf));
        }
        if (len)