Merge branch 'maint'

[git.git] / builtin-shortlog.c

diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index 2f71a2a6e2ecf556956a0271d8af9ad852d5a93c..2d7726e8b975d9977e14638cc127ed0b30d3058b 100644 (file)
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -217,13 +217,13 @@ static void get_from_rev(struct rev_info *rev, struct path_list *list)
 
        prepare_revision_walk(rev);
        while ((commit = get_revision(rev)) != NULL) {
-               char *author = NULL, *oneline, *buffer;
+               const char *author = NULL, *oneline, *buffer;
                int authorlen = authorlen, onelinelen;
 
                /* get author and oneline */
                for (buffer = commit->buffer; buffer && *buffer != '\0' &&
                                *buffer != '\n'; ) {
-                       char *eol = strchr(buffer, '\n');
+                       const char *eol = strchr(buffer, '\n');
 
                        if (eol == NULL)
                                eol = buffer + strlen(buffer);