ea0fdd44e2865e63c6e4750345a30c42e699cf66
[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
8 #include <pwd.h>
9 #include <time.h>
10
11 #define BLOCKING (1ul << 14)
12
13 /*
14 * FIXME! Share the code with "write-tree.c"
15 */
16 static void init_buffer(char **bufp, unsigned int *sizep)
17 {
18 char *buf = xmalloc(BLOCKING);
19 *sizep = 0;
20 *bufp = buf;
21 }
22
23 static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
24 {
25 char one_line[2048];
26 va_list args;
27 int len;
28 unsigned long alloc, size, newsize;
29 char *buf;
30
31 va_start(args, fmt);
32 len = vsnprintf(one_line, sizeof(one_line), fmt, args);
33 va_end(args);
34 size = *sizep;
35 newsize = size + len;
36 alloc = (size + 32767) & ~32767;
37 buf = *bufp;
38 if (newsize > alloc) {
39 alloc = (newsize + 32767) & ~32767;
40 buf = xrealloc(buf, alloc);
41 *bufp = buf;
42 }
43 *sizep = newsize;
44 memcpy(buf + size, one_line, len);
45 }
46
47 static void check_valid(unsigned char *sha1, const char *expect)
48 {
49 void *buf;
50 char type[20];
51 unsigned long size;
52
53 buf = read_sha1_file(sha1, type, &size);
54 if (!buf || strcmp(type, expect))
55 die("%s is not a valid '%s' object", sha1_to_hex(sha1), expect);
56 free(buf);
57 }
58
59 /*
60 * Having more than two parents is not strange at all, and this is
61 * how multi-way merges are represented.
62 */
63 #define MAXPARENT (16)
64 static unsigned char parent_sha1[MAXPARENT][20];
65
66 static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
67
68 static int new_parent(int idx)
69 {
70 int i;
71 unsigned char *sha1 = parent_sha1[idx];
72 for (i = 0; i < idx; i++) {
73 if (!memcmp(parent_sha1[i], sha1, 20)) {
74 error("duplicate parent %s ignored", sha1_to_hex(sha1));
75 return 0;
76 }
77 }
78 return 1;
79 }
80
81 int main(int argc, char **argv)
82 {
83 int i;
84 int parents = 0;
85 unsigned char tree_sha1[20];
86 unsigned char commit_sha1[20];
87 char comment[1000];
88 char *buffer;
89 unsigned int size;
90
91 setup_ident();
92 git_config(git_default_config);
93
94 if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
95 usage(commit_tree_usage);
96
97 check_valid(tree_sha1, "tree");
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");
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());
123 add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info());
124
125 /* And add the comment */
126 while (fgets(comment, sizeof(comment), stdin) != NULL)
127 add_buffer(&buffer, &size, "%s", comment);
128
129 write_sha1_file(buffer, size, "commit", commit_sha1);
130 printf("%s\n", sha1_to_hex(commit_sha1));
131 return 0;
132 }