Add --no-rebase option to git-svn dcommit
[git/jrn.git] / builtin-commit-tree.c
blob4a8d8d8b674c6f272243a074030af289403eadde
1 /*
2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
5 */
6 #include "cache.h"
7 #include "commit.h"
8 #include "tree.h"
9 #include "builtin.h"
10 #include "utf8.h"
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);
20 *sizep = 0;
21 *bufp = buf;
24 static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
26 char one_line[2048];
27 va_list args;
28 int len;
29 unsigned long alloc, size, newsize;
30 char *buf;
32 va_start(args, fmt);
33 len = vsnprintf(one_line, sizeof(one_line), fmt, args);
34 va_end(args);
35 size = *sizep;
36 newsize = size + len + 1;
37 alloc = (size + 32767) & ~32767;
38 buf = *bufp;
39 if (newsize > alloc) {
40 alloc = (newsize + 32767) & ~32767;
41 buf = xrealloc(buf, alloc);
42 *bufp = buf;
44 *sizep = newsize - 1;
45 memcpy(buf + size, one_line, len);
48 static void check_valid(unsigned char *sha1, enum object_type expect)
50 enum object_type type = sha1_object_info(sha1, NULL);
51 if (type < 0)
52 die("%s is not a valid object", sha1_to_hex(sha1));
53 if (type != expect)
54 die("%s is not a valid '%s' object", sha1_to_hex(sha1),
55 typename(expect));
59 * Having more than two parents is not strange at all, and this is
60 * how multi-way merges are represented.
62 #define MAXPARENT (16)
63 static unsigned char parent_sha1[MAXPARENT][20];
65 static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
67 static int new_parent(int idx)
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;
77 return 1;
80 static const char commit_utf8_warn[] =
81 "Warning: commit message does not conform to UTF-8.\n"
82 "You may want to amend it after fixing the message, or set the config\n"
83 "variable i18n.commitencoding to the encoding your project uses.\n";
85 int cmd_commit_tree(int argc, const char **argv, const char *prefix)
87 int i;
88 int parents = 0;
89 unsigned char tree_sha1[20];
90 unsigned char commit_sha1[20];
91 char comment[1000];
92 char *buffer;
93 unsigned int size;
94 int encoding_is_utf8;
96 git_config(git_default_config);
98 if (argc < 2)
99 usage(commit_tree_usage);
100 if (get_sha1(argv[1], tree_sha1))
101 die("Not a valid object name %s", argv[1]);
103 check_valid(tree_sha1, OBJ_TREE);
104 for (i = 2; i < argc; i += 2) {
105 const char *a, *b;
106 a = argv[i]; b = argv[i+1];
107 if (!b || strcmp(a, "-p"))
108 usage(commit_tree_usage);
110 if (parents >= MAXPARENT)
111 die("Too many parents (%d max)", MAXPARENT);
112 if (get_sha1(b, parent_sha1[parents]))
113 die("Not a valid object name %s", b);
114 check_valid(parent_sha1[parents], OBJ_COMMIT);
115 if (new_parent(parents))
116 parents++;
119 /* Not having i18n.commitencoding is the same as having utf-8 */
120 encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
122 init_buffer(&buffer, &size);
123 add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));
126 * NOTE! This ordering means that the same exact tree merged with a
127 * different order of parents will be a _different_ changeset even
128 * if everything else stays the same.
130 for (i = 0; i < parents; i++)
131 add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i]));
133 /* Person/date information */
134 add_buffer(&buffer, &size, "author %s\n", git_author_info(1));
135 add_buffer(&buffer, &size, "committer %s\n", git_committer_info(1));
136 if (!encoding_is_utf8)
137 add_buffer(&buffer, &size,
138 "encoding %s\n", git_commit_encoding);
139 add_buffer(&buffer, &size, "\n");
141 /* And add the comment */
142 while (fgets(comment, sizeof(comment), stdin) != NULL)
143 add_buffer(&buffer, &size, "%s", comment);
145 /* And check the encoding */
146 buffer[size] = '\0';
147 if (encoding_is_utf8 && !is_utf8(buffer))
148 fprintf(stderr, commit_utf8_warn);
150 if (!write_sha1_file(buffer, size, commit_type, commit_sha1)) {
151 printf("%s\n", sha1_to_hex(commit_sha1));
152 return 0;
154 else
155 return 1;