Merge branch 'maint'
[git/git.git] / builtin-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 #include "builtin.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 char type[20];
50
51 if (sha1_object_info(sha1, type, NULL))
52 die("%s is not a valid object", sha1_to_hex(sha1));
53 if (expect && strcmp(type, expect))
54 die("%s is not a valid '%s' object", sha1_to_hex(sha1),
55 expect);
56 }
57
58 /*
59 * Having more than two parents is not strange at all, and this is
60 * how multi-way merges are represented.
61 */
62 #define MAXPARENT (16)
63 static unsigned char parent_sha1[MAXPARENT][20];
64
65 static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
66
67 static int new_parent(int idx)
68 {
69 int i;
70 unsigned char *sha1 = parent_sha1[idx];
71 for (i = 0; i < idx; i++) {
72 if (!hashcmp(parent_sha1[i], sha1)) {
73 error("duplicate parent %s ignored", sha1_to_hex(sha1));
74 return 0;
75 }
76 }
77 return 1;
78 }
79
80 int cmd_commit_tree(int argc, const char **argv, const char *prefix)
81 {
82 int i;
83 int parents = 0;
84 unsigned char tree_sha1[20];
85 unsigned char commit_sha1[20];
86 char comment[1000];
87 char *buffer;
88 unsigned int size;
89
90 setup_ident();
91 git_config(git_default_config);
92
93 if (argc < 2)
94 usage(commit_tree_usage);
95 if (get_sha1(argv[1], tree_sha1))
96 die("Not a valid object name %s", argv[1]);
97
98 check_valid(tree_sha1, tree_type);
99 for (i = 2; i < argc; i += 2) {
100 const char *a, *b;
101 a = argv[i]; b = argv[i+1];
102 if (!b || strcmp(a, "-p"))
103 usage(commit_tree_usage);
104 if (get_sha1(b, parent_sha1[parents]))
105 die("Not a valid object name %s", b);
106 check_valid(parent_sha1[parents], commit_type);
107 if (new_parent(parents))
108 parents++;
109 }
110 if (!parents)
111 fprintf(stderr, "Committing initial tree %s\n", argv[1]);
112
113 init_buffer(&buffer, &size);
114 add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));
115
116 /*
117 * NOTE! This ordering means that the same exact tree merged with a
118 * different order of parents will be a _different_ changeset even
119 * if everything else stays the same.
120 */
121 for (i = 0; i < parents; i++)
122 add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i]));
123
124 /* Person/date information */
125 add_buffer(&buffer, &size, "author %s\n", git_author_info(1));
126 add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info(1));
127
128 /* And add the comment */
129 while (fgets(comment, sizeof(comment), stdin) != NULL)
130 add_buffer(&buffer, &size, "%s", comment);
131
132 if (!write_sha1_file(buffer, size, commit_type, commit_sha1)) {
133 printf("%s\n", sha1_to_hex(commit_sha1));
134 return 0;
135 }
136 else
137 return 1;
138 }