]> git.ipfire.org Git - thirdparty/git.git/blame - builtin-commit-tree.c
Add and document a global --no-pager option for git.
[thirdparty/git.git] / builtin-commit-tree.c
CommitLineData
8bc9a0c7
LT
1/*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
e83c5163 6#include "cache.h"
8e440259
PE
7#include "commit.h"
8#include "tree.h"
6d96ac18 9#include "builtin.h"
9e832665 10#include "utf8.h"
e83c5163 11
e83c5163 12#define BLOCKING (1ul << 14)
e83c5163
LT
13
14/*
e83c5163
LT
15 * FIXME! Share the code with "write-tree.c"
16 */
17static void init_buffer(char **bufp, unsigned int *sizep)
18{
3e0a93a5 19 *bufp = xmalloc(BLOCKING);
a44c9a5e 20 *sizep = 0;
e83c5163
LT
21}
22
23static 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;
9e832665 35 newsize = size + len + 1;
e83c5163
LT
36 alloc = (size + 32767) & ~32767;
37 buf = *bufp;
38 if (newsize > alloc) {
aebb2679 39 alloc = (newsize + 32767) & ~32767;
812666c8 40 buf = xrealloc(buf, alloc);
e83c5163
LT
41 *bufp = buf;
42 }
9e832665 43 *sizep = newsize - 1;
e83c5163
LT
44 memcpy(buf + size, one_line, len);
45}
46
66035a6b 47static void check_valid(unsigned char *sha1, enum object_type expect)
d0d7cbe7 48{
21666f1a
NP
49 enum object_type type = sha1_object_info(sha1, NULL);
50 if (type < 0)
5981e099 51 die("%s is not a valid object", sha1_to_hex(sha1));
66035a6b 52 if (type != expect)
5981e099 53 die("%s is not a valid '%s' object", sha1_to_hex(sha1),
66035a6b 54 typename(expect));
d0d7cbe7
LT
55}
56
e83c5163 57/*
c5bac17a
JH
58 * Having more than two parents is not strange at all, and this is
59 * how multi-way merges are represented.
e83c5163
LT
60 */
61#define MAXPARENT (16)
b389237a 62static unsigned char parent_sha1[MAXPARENT][20];
e83c5163 63
4d1f1190 64static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
c5bac17a 65
b389237a
LT
66static int new_parent(int idx)
67{
68 int i;
69 unsigned char *sha1 = parent_sha1[idx];
70 for (i = 0; i < idx; i++) {
a89fccd2 71 if (!hashcmp(parent_sha1[i], sha1)) {
b389237a
LT
72 error("duplicate parent %s ignored", sha1_to_hex(sha1));
73 return 0;
74 }
75 }
76 return 1;
77}
78
9e832665
JS
79static const char commit_utf8_warn[] =
80"Warning: commit message does not conform to UTF-8.\n"
81"You may want to amend it after fixing the message, or set the config\n"
82"variable i18n.commitencoding to the encoding your project uses.\n";
83
a633fca0 84int cmd_commit_tree(int argc, const char **argv, const char *prefix)
e83c5163 85{
6aa33f40 86 int i;
e83c5163
LT
87 int parents = 0;
88 unsigned char tree_sha1[20];
d6d3f9d0 89 unsigned char commit_sha1[20];
e83c5163 90 char comment[1000];
e83c5163
LT
91 char *buffer;
92 unsigned int size;
4b2bced5 93 int encoding_is_utf8;
e83c5163 94
e1b10391
LT
95 git_config(git_default_config);
96
31fff305 97 if (argc < 2)
c5bac17a 98 usage(commit_tree_usage);
31fff305
DL
99 if (get_sha1(argv[1], tree_sha1))
100 die("Not a valid object name %s", argv[1]);
e83c5163 101
66035a6b 102 check_valid(tree_sha1, OBJ_TREE);
e83c5163 103 for (i = 2; i < argc; i += 2) {
6d96ac18 104 const char *a, *b;
e83c5163 105 a = argv[i]; b = argv[i+1];
31fff305 106 if (!b || strcmp(a, "-p"))
c5bac17a 107 usage(commit_tree_usage);
2295e8d0
JH
108
109 if (parents >= MAXPARENT)
110 die("Too many parents (%d max)", MAXPARENT);
31fff305
DL
111 if (get_sha1(b, parent_sha1[parents]))
112 die("Not a valid object name %s", b);
66035a6b 113 check_valid(parent_sha1[parents], OBJ_COMMIT);
b389237a
LT
114 if (new_parent(parents))
115 parents++;
e83c5163 116 }
e83c5163 117
d2c11a38 118 /* Not having i18n.commitencoding is the same as having utf-8 */
677cfed5 119 encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
4b2bced5 120
e83c5163
LT
121 init_buffer(&buffer, &size);
122 add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));
123
124 /*
125 * NOTE! This ordering means that the same exact tree merged with a
126 * different order of parents will be a _different_ changeset even
127 * if everything else stays the same.
128 */
129 for (i = 0; i < parents; i++)
130 add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i]));
131
132 /* Person/date information */
749be728 133 add_buffer(&buffer, &size, "author %s\n", git_author_info(1));
4b2bced5
JH
134 add_buffer(&buffer, &size, "committer %s\n", git_committer_info(1));
135 if (!encoding_is_utf8)
136 add_buffer(&buffer, &size,
137 "encoding %s\n", git_commit_encoding);
138 add_buffer(&buffer, &size, "\n");
e83c5163
LT
139
140 /* And add the comment */
141 while (fgets(comment, sizeof(comment), stdin) != NULL)
142 add_buffer(&buffer, &size, "%s", comment);
143
9e832665
JS
144 /* And check the encoding */
145 buffer[size] = '\0';
4b2bced5 146 if (encoding_is_utf8 && !is_utf8(buffer))
9e832665
JS
147 fprintf(stderr, commit_utf8_warn);
148
8e440259 149 if (!write_sha1_file(buffer, size, commit_type, commit_sha1)) {
7561d9f5
JH
150 printf("%s\n", sha1_to_hex(commit_sha1));
151 return 0;
152 }
153 else
154 return 1;
e83c5163 155}