Merge branch 'js/patch'

diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c
index b27a6d382b7540d1d9f6fc98784646458b217af6..5f5ade45aec781df107d4a49a4a554575ac278bd 100644 (file)
--- a/builtin-rev-parse.c
+++ b/builtin-rev-parse.c
@@ -329,7 +329,7 @@ int cmd_rev_parse(int argc, const char **argv, char **envp)
                dotdot = strstr(arg, "..");
                if (dotdot) {
                        unsigned char end[20];
-                       char *next = dotdot + 2;
+                       const char *next = dotdot + 2;
                        const char *this = arg;
                        *dotdot = 0;
                        if (!*next)