Merge branch 'master' into next

diff --git a/commit.c b/commit.c
index d4976fb89f30eacaa1cfe015c6f7a035a1225f55..05c4c923faaa1b2ee0c48ebc4230657fbbab6077 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -101,11 +101,7 @@ static unsigned long parse_commit_date(const char *buf)
        return date;
 }
 
-static struct commit_graft {
-       unsigned char sha1[20];
-       int nr_parent;
-       unsigned char parent[0][20]; /* more */
-} **commit_graft;
+static struct commit_graft **commit_graft;
 static int commit_graft_alloc, commit_graft_nr;
 
 static int commit_graft_pos(const unsigned char *sha1)
@@ -127,70 +123,100 @@ static int commit_graft_pos(const unsigned char *sha1)
        return -lo - 1;
 }
 
-static void prepare_commit_graft(void)
+int register_commit_graft(struct commit_graft *graft, int ignore_dups)
+{
+       int pos = commit_graft_pos(graft->sha1);
+       
+       if (0 <= pos) {
+               if (ignore_dups)
+                       free(graft);
+               else {
+                       free(commit_graft[pos]);
+                       commit_graft[pos] = graft;
+               }
+               return 1;
+       }
+       pos = -pos - 1;
+       if (commit_graft_alloc <= ++commit_graft_nr) {
+               commit_graft_alloc = alloc_nr(commit_graft_alloc);
+               commit_graft = xrealloc(commit_graft,
+                                       sizeof(*commit_graft) *
+                                       commit_graft_alloc);
+       }
+       if (pos < commit_graft_nr)
+               memmove(commit_graft + pos + 1,
+                       commit_graft + pos,
+                       (commit_graft_nr - pos - 1) *
+                       sizeof(*commit_graft));
+       commit_graft[pos] = graft;
+       return 0;
+}
+
+struct commit_graft *read_graft_line(char *buf, int len)
+{
+       /* The format is just "Commit Parent1 Parent2 ...\n" */
+       int i;
+       struct commit_graft *graft = NULL;
+
+       if (buf[len-1] == '\n')
+               buf[--len] = 0;
+       if (buf[0] == '#')
+               return NULL;
+       if ((len + 1) % 41) {
+       bad_graft_data:
+               error("bad graft data: %s", buf);
+               free(graft);
+               return NULL;
+       }
+       i = (len + 1) / 41 - 1;
+       graft = xmalloc(sizeof(*graft) + 20 * i);
+       graft->nr_parent = i;
+       if (get_sha1_hex(buf, graft->sha1))
+               goto bad_graft_data;
+       for (i = 40; i < len; i += 41) {
+               if (buf[i] != ' ')
+                       goto bad_graft_data;
+               if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
+                       goto bad_graft_data;
+       }
+       return graft;
+}
+
+int read_graft_file(const char *graft_file)
 {
-       char *graft_file = get_graft_file();
        FILE *fp = fopen(graft_file, "r");
        char buf[1024];
-       if (!fp) {
-               commit_graft = (struct commit_graft **) "hack";
-               return;
-       }
+       if (!fp)
+               return -1;
        while (fgets(buf, sizeof(buf), fp)) {
                /* The format is just "Commit Parent1 Parent2 ...\n" */
                int len = strlen(buf);
-               int i;
-               struct commit_graft *graft = NULL;
-
-               if (buf[len-1] == '\n')
-                       buf[--len] = 0;
-               if (buf[0] == '#')
-                       continue;
-               if ((len + 1) % 41) {
-               bad_graft_data:
-                       error("bad graft data: %s", buf);
-                       free(graft);
+               struct commit_graft *graft = read_graft_line(buf, len);
+               if (!graft)
                        continue;
-               }
-               i = (len + 1) / 41 - 1;
-               graft = xmalloc(sizeof(*graft) + 20 * i);
-               graft->nr_parent = i;
-               if (get_sha1_hex(buf, graft->sha1))
-                       goto bad_graft_data;
-               for (i = 40; i < len; i += 41) {
-                       if (buf[i] != ' ')
-                               goto bad_graft_data;
-                       if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
-                               goto bad_graft_data;
-               }
-               i = commit_graft_pos(graft->sha1);
-               if (0 <= i) {
+               if (register_commit_graft(graft, 1))
                        error("duplicate graft data: %s", buf);
-                       free(graft);
-                       continue;
-               }
-               i = -i - 1;
-               if (commit_graft_alloc <= ++commit_graft_nr) {
-                       commit_graft_alloc = alloc_nr(commit_graft_alloc);
-                       commit_graft = xrealloc(commit_graft,
-                                               sizeof(*commit_graft) *
-                                               commit_graft_alloc);
-               }
-               if (i < commit_graft_nr)
-                       memmove(commit_graft + i + 1,
-                               commit_graft + i,
-                               (commit_graft_nr - i - 1) *
-                               sizeof(*commit_graft));
-               commit_graft[i] = graft;
        }
        fclose(fp);
+       return 0;
+}
+
+static void prepare_commit_graft(void)
+{
+       static int commit_graft_prepared;
+       char *graft_file;
+
+       if (commit_graft_prepared)
+               return;
+       graft_file = get_graft_file();
+       read_graft_file(graft_file);
+       commit_graft_prepared = 1;
 }
 
 static struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
 {
        int pos;
-       if (!commit_graft)
-               prepare_commit_graft();
+       prepare_commit_graft();
        pos = commit_graft_pos(sha1);
        if (pos < 0)
                return NULL;
@@ -376,11 +402,11 @@ static int get_one_line(const char *msg, unsigned long len)
 
        while (len--) {
                char c = *msg++;
+               if (!c)
+                       break;
                ret++;
                if (c == '\n')
                        break;
-               if (!c)
-                       return 0;
        }
        return ret;
 }
@@ -533,16 +559,11 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
                if (fmt == CMIT_FMT_ONELINE)
                        break;
        }
-       if (fmt == CMIT_FMT_ONELINE) {
-               /* We do not want the terminating newline */
-               if (buf[offset - 1] == '\n')
-                       offset--;
-       }
-       else {
-               /* Make sure there is an EOLN */
-               if (buf[offset - 1] != '\n')
-                       buf[offset++] = '\n';
-       }
+       while (offset && isspace(buf[offset-1]))
+               offset--;
+       /* Make sure there is an EOLN for the non-oneline case */
+       if (fmt != CMIT_FMT_ONELINE)
+               buf[offset++] = '\n';
        buf[offset] = '\0';
        return offset;
 }