2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
8 #define BLOCKING (1ul << 14)
11 * FIXME! Share the code with "write-tree.c"
13 static void init_buffer(char **bufp, unsigned int *sizep)
15 char *buf = xmalloc(BLOCKING);
20 static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
25 unsigned long alloc, size, newsize;
29 len = vsnprintf(one_line, sizeof(one_line), fmt, args);
33 alloc = (size + 32767) & ~32767;
35 if (newsize > alloc) {
36 alloc = (newsize + 32767) & ~32767;
37 buf = xrealloc(buf, alloc);
41 memcpy(buf + size, one_line, len);
44 static void check_valid(unsigned char *sha1, const char *expect)
50 buf = read_sha1_file(sha1, type, &size);
51 if (!buf || strcmp(type, expect))
52 die("%s is not a valid '%s' object", sha1_to_hex(sha1), expect);
57 * Having more than two parents is not strange at all, and this is
58 * how multi-way merges are represented.
60 #define MAXPARENT (16)
61 static unsigned char parent_sha1[MAXPARENT][20];
63 static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
65 static int new_parent(int idx)
68 unsigned char *sha1 = parent_sha1[idx];
69 for (i = 0; i < idx; i++) {
70 if (!memcmp(parent_sha1[i], sha1, 20)) {
71 error("duplicate parent %s ignored", sha1_to_hex(sha1));
78 int main(int argc, char **argv)
82 unsigned char tree_sha1[20];
83 unsigned char commit_sha1[20];
89 setup_git_directory();
91 git_config(git_default_config);
93 if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
94 usage(commit_tree_usage);
96 check_valid(tree_sha1, "tree");
97 for (i = 2; i < argc; i += 2) {
99 a = argv[i]; b = argv[i+1];
100 if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
101 usage(commit_tree_usage);
102 check_valid(parent_sha1[parents], "commit");
103 if (new_parent(parents))
107 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(1));
122 add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info(1));
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));