blob: b1ef0b590ab879fbbc93d04a2f8f488a223ea58d [file] [log] [blame]
Linus Torvalds8bc9a0c2005-04-07 15:16:10 -07001/*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
Linus Torvaldse83c5162005-04-07 15:13:13 -07006#include "cache.h"
7
8#include <pwd.h>
9#include <time.h>
David Woodhouse27de9462005-04-15 08:39:57 -070010#include <ctype.h>
Linus Torvaldse83c5162005-04-07 15:13:13 -070011
12#define BLOCKING (1ul << 14)
Linus Torvaldse83c5162005-04-07 15:13:13 -070013
14/*
Linus Torvaldse83c5162005-04-07 15:13:13 -070015 * FIXME! Share the code with "write-tree.c"
16 */
17static void init_buffer(char **bufp, unsigned int *sizep)
18{
Christopher Li812666c2005-04-26 12:00:58 -070019 char *buf = xmalloc(BLOCKING);
Linus Torvaldsa44c9a52005-04-25 10:19:53 -070020 *sizep = 0;
Linus Torvaldse83c5162005-04-07 15:13:13 -070021 *bufp = buf;
22}
23
24static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
25{
26 char one_line[2048];
27 va_list args;
28 int len;
29 unsigned long alloc, size, newsize;
30 char *buf;
31
32 va_start(args, fmt);
33 len = vsnprintf(one_line, sizeof(one_line), fmt, args);
34 va_end(args);
35 size = *sizep;
36 newsize = size + len;
37 alloc = (size + 32767) & ~32767;
38 buf = *bufp;
39 if (newsize > alloc) {
Ingo Molnaraebb2672005-04-12 11:36:26 -070040 alloc = (newsize + 32767) & ~32767;
Christopher Li812666c2005-04-26 12:00:58 -070041 buf = xrealloc(buf, alloc);
Linus Torvaldse83c5162005-04-07 15:13:13 -070042 *bufp = buf;
43 }
44 *sizep = newsize;
45 memcpy(buf + size, one_line, len);
46}
47
Linus Torvaldsd0d7cbe2005-04-17 15:26:13 -070048static void check_valid(unsigned char *sha1, const char *expect)
49{
50 void *buf;
51 char type[20];
52 unsigned long size;
53
54 buf = read_sha1_file(sha1, type, &size);
55 if (!buf || strcmp(type, expect))
56 die("%s is not a valid '%s' object", sha1_to_hex(sha1), expect);
57 free(buf);
58}
59
Linus Torvaldse83c5162005-04-07 15:13:13 -070060/*
Junio C Hamanoc5bac172005-04-20 19:49:16 -070061 * Having more than two parents is not strange at all, and this is
62 * how multi-way merges are represented.
Linus Torvaldse83c5162005-04-07 15:13:13 -070063 */
64#define MAXPARENT (16)
Linus Torvaldsb3892372005-06-19 10:40:10 -070065static unsigned char parent_sha1[MAXPARENT][20];
Linus Torvaldse83c5162005-04-07 15:13:13 -070066
Petr Baudis4d1f1192005-07-29 11:01:26 +020067static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
Junio C Hamanoc5bac172005-04-20 19:49:16 -070068
Linus Torvaldsb3892372005-06-19 10:40:10 -070069static int new_parent(int idx)
70{
71 int i;
72 unsigned char *sha1 = parent_sha1[idx];
73 for (i = 0; i < idx; i++) {
74 if (!memcmp(parent_sha1[i], sha1, 20)) {
75 error("duplicate parent %s ignored", sha1_to_hex(sha1));
76 return 0;
77 }
78 }
79 return 1;
80}
81
Linus Torvaldse83c5162005-04-07 15:13:13 -070082int main(int argc, char **argv)
83{
Linus Torvalds6aa33f42005-07-12 11:49:27 -070084 int i;
Linus Torvaldse83c5162005-04-07 15:13:13 -070085 int parents = 0;
86 unsigned char tree_sha1[20];
Linus Torvaldsd6d3f9d2005-04-09 17:09:34 -070087 unsigned char commit_sha1[20];
Linus Torvaldse83c5162005-04-07 15:13:13 -070088 char comment[1000];
Linus Torvaldse83c5162005-04-07 15:13:13 -070089 char *buffer;
90 unsigned int size;
91
92 if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
Junio C Hamanoc5bac172005-04-20 19:49:16 -070093 usage(commit_tree_usage);
Linus Torvaldse83c5162005-04-07 15:13:13 -070094
Linus Torvaldsd0d7cbe2005-04-17 15:26:13 -070095 check_valid(tree_sha1, "tree");
Linus Torvaldse83c5162005-04-07 15:13:13 -070096 for (i = 2; i < argc; i += 2) {
97 char *a, *b;
98 a = argv[i]; b = argv[i+1];
Linus Torvalds3c249c92005-05-01 16:36:56 -070099 if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
Junio C Hamanoc5bac172005-04-20 19:49:16 -0700100 usage(commit_tree_usage);
Linus Torvaldsd0d7cbe2005-04-17 15:26:13 -0700101 check_valid(parent_sha1[parents], "commit");
Linus Torvaldsb3892372005-06-19 10:40:10 -0700102 if (new_parent(parents))
103 parents++;
Linus Torvaldse83c5162005-04-07 15:13:13 -0700104 }
105 if (!parents)
106 fprintf(stderr, "Committing initial tree %s\n", argv[1]);
Linus Torvalds6aa33f42005-07-12 11:49:27 -0700107 setup_ident();
Linus Torvaldse83c5162005-04-07 15:13:13 -0700108
109 init_buffer(&buffer, &size);
110 add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));
111
112 /*
113 * NOTE! This ordering means that the same exact tree merged with a
114 * different order of parents will be a _different_ changeset even
115 * if everything else stays the same.
116 */
117 for (i = 0; i < parents; i++)
118 add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i]));
119
120 /* Person/date information */
Linus Torvalds6aa33f42005-07-12 11:49:27 -0700121 add_buffer(&buffer, &size, "author %s\n", git_author_info());
122 add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info());
Linus Torvaldse83c5162005-04-07 15:13:13 -0700123
124 /* And add the comment */
125 while (fgets(comment, sizeof(comment), stdin) != NULL)
126 add_buffer(&buffer, &size, "%s", comment);
127
Linus Torvaldsa44c9a52005-04-25 10:19:53 -0700128 write_sha1_file(buffer, size, "commit", commit_sha1);
Linus Torvaldsd6d3f9d2005-04-09 17:09:34 -0700129 printf("%s\n", sha1_to_hex(commit_sha1));
Linus Torvaldse83c5162005-04-07 15:13:13 -0700130 return 0;
131}