Merge branch 'fix'
[git/git.git] / commit-tree.c
1 /*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
6 #include "cache.h"
7 #include "commit.h"
8 #include "tree.h"
9
10 #define BLOCKING (1ul << 14)
11
12 /*
13 * FIXME! Share the code with "write-tree.c"
14 */
15 static void init_buffer(char **bufp, unsigned int *sizep)
16 {
17 char *buf = xmalloc(BLOCKING);
18 *sizep = 0;
19 *bufp = buf;
20 }
21
22 static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
23 {
24 char one_line[2048];
25 va_list args;
26 int len;
27 unsigned long alloc, size, newsize;
28 char *buf;
29
30 va_start(args, fmt);
31 len = vsnprintf(one_line, sizeof(one_line), fmt, args);
32 va_end(args);
33 size = *sizep;
34 newsize = size + len;
35 alloc = (size + 32767) & ~32767;
36 buf = *bufp;
37 if (newsize > alloc) {
38 alloc = (newsize + 32767) & ~32767;
39 buf = xrealloc(buf, alloc);
40 *bufp = buf;
41 }
42 *sizep = newsize;
43 memcpy(buf + size, one_line, len);
44 }
45
46 static void check_valid(unsigned char *sha1, const char *expect)
47 {
48 char type[20];
49
50 if (sha1_object_info(sha1, type, NULL))
51 die("%s is not a valid object", sha1_to_hex(sha1));
52 if (expect && strcmp(type, expect))
53 die("%s is not a valid '%s' object", sha1_to_hex(sha1),
54 expect);
55 }
56
57 /*
58 * Having more than two parents is not strange at all, and this is
59 * how multi-way merges are represented.
60 */
61 #define MAXPARENT (16)
62 static unsigned char parent_sha1[MAXPARENT][20];
63
64 static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
65
66 static int new_parent(int idx)
67 {
68 int i;
69 unsigned char *sha1 = parent_sha1[idx];
70 for (i = 0; i < idx; i++) {
71 if (!memcmp(parent_sha1[i], sha1, 20)) {
72 error("duplicate parent %s ignored", sha1_to_hex(sha1));
73 return 0;
74 }
75 }
76 return 1;
77 }
78
79 int main(int argc, char **argv)
80 {
81 int i;
82 int parents = 0;
83 unsigned char tree_sha1[20];
84 unsigned char commit_sha1[20];
85 char comment[1000];
86 char *buffer;
87 unsigned int size;
88
89 setup_ident();
90 setup_git_directory();
91
92 git_config(git_default_config);
93
94 if (argc < 2 || get_sha1(argv[1], tree_sha1) < 0)
95 usage(commit_tree_usage);
96
97 check_valid(tree_sha1, tree_type);
98 for (i = 2; i < argc; i += 2) {
99 char *a, *b;
100 a = argv[i]; b = argv[i+1];
101 if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
102 usage(commit_tree_usage);
103 check_valid(parent_sha1[parents], commit_type);
104 if (new_parent(parents))
105 parents++;
106 }
107 if (!parents)
108 fprintf(stderr, "Committing initial tree %s\n", argv[1]);
109
110 init_buffer(&buffer, &size);
111 add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));
112
113 /*
114 * NOTE! This ordering means that the same exact tree merged with a
115 * different order of parents will be a _different_ changeset even
116 * if everything else stays the same.
117 */
118 for (i = 0; i < parents; i++)
119 add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i]));
120
121 /* Person/date information */
122 add_buffer(&buffer, &size, "author %s\n", git_author_info(1));
123 add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info(1));
124
125 /* And add the comment */
126 while (fgets(comment, sizeof(comment), stdin) != NULL)
127 add_buffer(&buffer, &size, "%s", comment);
128
129 if (!write_sha1_file(buffer, size, commit_type, commit_sha1)) {
130 printf("%s\n", sha1_to_hex(commit_sha1));
131 return 0;
132 }
133 else
134 return 1;
135 }