2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
12 #define BLOCKING (1ul << 14)
15 * FIXME! Share the code with "write-tree.c"
17 static void init_buffer(char **bufp, unsigned int *sizep)
19 char *buf = xmalloc(BLOCKING);
24 static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
29 unsigned long alloc, size, newsize;
33 len = vsnprintf(one_line, sizeof(one_line), fmt, args);
37 alloc = (size + 32767) & ~32767;
39 if (newsize > alloc) {
40 alloc = (newsize + 32767) & ~32767;
41 buf = xrealloc(buf, alloc);
45 memcpy(buf + size, one_line, len);
48 static void check_valid(unsigned char *sha1, const char *expect)
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);
61 * Having more than two parents is not strange at all, and this is
62 * how multi-way merges are represented.
64 #define MAXPARENT (16)
65 static unsigned char parent_sha1[MAXPARENT][20];
67 static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
69 static int new_parent(int idx)
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));
82 int main(int argc, char **argv)
86 unsigned char tree_sha1[20];
87 unsigned char commit_sha1[20];
92 if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
93 usage(commit_tree_usage);
95 check_valid(tree_sha1, "tree");
96 for (i = 2; i < argc; i += 2) {
98 a = argv[i]; b = argv[i+1];
99 if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
100 usage(commit_tree_usage);
101 check_valid(parent_sha1[parents], "commit");
102 if (new_parent(parents))
106 fprintf(stderr, "Committing initial tree %s\n", argv[1]);
109 init_buffer(&buffer, &size);
110 add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));
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.
117 for (i = 0; i < parents; i++)
118 add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i]));
120 /* Person/date information */
121 add_buffer(&buffer, &size, "author %s\n", git_author_info());
122 add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info());
124 /* And add the comment */
125 while (fgets(comment, sizeof(comment), stdin) != NULL)
126 add_buffer(&buffer, &size, "%s", comment);
128 write_sha1_file(buffer, size, "commit", commit_sha1);
129 printf("%s\n", sha1_to_hex(commit_sha1));