diff-cache shows differences for unmerged paths without --cache.
[git.git] / commit-tree.c
blobcfd6730fe8da68a9b4e10ccf6481a2a1264fc81d
1 /*
2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
5 */
6 #include "cache.h"
8 #include <pwd.h>
9 #include <time.h>
10 #include <string.h>
11 #include <ctype.h>
12 #include <time.h>
14 #define BLOCKING (1ul << 14)
17 * FIXME! Share the code with "write-tree.c"
19 static void init_buffer(char **bufp, unsigned int *sizep)
21 char *buf = xmalloc(BLOCKING);
22 *sizep = 0;
23 *bufp = buf;
26 static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
28 char one_line[2048];
29 va_list args;
30 int len;
31 unsigned long alloc, size, newsize;
32 char *buf;
34 va_start(args, fmt);
35 len = vsnprintf(one_line, sizeof(one_line), fmt, args);
36 va_end(args);
37 size = *sizep;
38 newsize = size + len;
39 alloc = (size + 32767) & ~32767;
40 buf = *bufp;
41 if (newsize > alloc) {
42 alloc = (newsize + 32767) & ~32767;
43 buf = xrealloc(buf, alloc);
44 *bufp = buf;
46 *sizep = newsize;
47 memcpy(buf + size, one_line, len);
50 static void remove_special(char *p)
52 char c;
53 char *dst = p, *src = p;
55 for (;;) {
56 c = *src;
57 src++;
58 switch(c) {
59 case '\n': case '<': case '>':
60 continue;
62 *dst++ = c;
63 if (!c)
64 break;
68 * Go back, and remove crud from the end: some people
69 * have commas etc in their gecos field
71 dst--;
72 while (--dst >= p) {
73 unsigned char c = *dst;
74 switch (c) {
75 case ',': case ';': case '.':
76 *dst = 0;
77 continue;
79 break;
83 static void check_valid(unsigned char *sha1, const char *expect)
85 void *buf;
86 char type[20];
87 unsigned long size;
89 buf = read_sha1_file(sha1, type, &size);
90 if (!buf || strcmp(type, expect))
91 die("%s is not a valid '%s' object", sha1_to_hex(sha1), expect);
92 free(buf);
96 * Having more than two parents is not strange at all, and this is
97 * how multi-way merges are represented.
99 #define MAXPARENT (16)
101 static char *commit_tree_usage = "commit-tree <sha1> [-p <sha1>]* < changelog";
103 int main(int argc, char **argv)
105 int i, len;
106 int parents = 0;
107 unsigned char tree_sha1[20];
108 unsigned char parent_sha1[MAXPARENT][20];
109 unsigned char commit_sha1[20];
110 char *gecos, *realgecos, *commitgecos;
111 char *email, *commitemail, realemail[1000];
112 char date[20], realdate[20];
113 char *audate;
114 char comment[1000];
115 struct passwd *pw;
116 char *buffer;
117 unsigned int size;
119 if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
120 usage(commit_tree_usage);
122 check_valid(tree_sha1, "tree");
123 for (i = 2; i < argc; i += 2) {
124 char *a, *b;
125 a = argv[i]; b = argv[i+1];
126 if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
127 usage(commit_tree_usage);
128 check_valid(parent_sha1[parents], "commit");
129 parents++;
131 if (!parents)
132 fprintf(stderr, "Committing initial tree %s\n", argv[1]);
133 pw = getpwuid(getuid());
134 if (!pw)
135 die("You don't exist. Go away!");
136 realgecos = pw->pw_gecos;
137 len = strlen(pw->pw_name);
138 memcpy(realemail, pw->pw_name, len);
139 realemail[len] = '@';
140 gethostname(realemail+len+1, sizeof(realemail)-len-1);
141 if (!strchr(realemail+len+1, '.')) {
142 strcat(realemail, ".");
143 getdomainname(realemail+strlen(realemail), sizeof(realemail)-strlen(realemail)-1);
146 datestamp(realdate, sizeof(realdate));
147 strcpy(date, realdate);
149 commitgecos = getenv("COMMIT_AUTHOR_NAME") ? : realgecos;
150 commitemail = getenv("COMMIT_AUTHOR_EMAIL") ? : realemail;
151 gecos = getenv("AUTHOR_NAME") ? : realgecos;
152 email = getenv("AUTHOR_EMAIL") ? : realemail;
153 audate = getenv("AUTHOR_DATE");
154 if (audate)
155 parse_date(audate, date, sizeof(date));
157 remove_special(gecos); remove_special(realgecos); remove_special(commitgecos);
158 remove_special(email); remove_special(realemail); remove_special(commitemail);
160 init_buffer(&buffer, &size);
161 add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));
164 * NOTE! This ordering means that the same exact tree merged with a
165 * different order of parents will be a _different_ changeset even
166 * if everything else stays the same.
168 for (i = 0; i < parents; i++)
169 add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i]));
171 /* Person/date information */
172 add_buffer(&buffer, &size, "author %s <%s> %s\n", gecos, email, date);
173 add_buffer(&buffer, &size, "committer %s <%s> %s\n\n", commitgecos, commitemail, realdate);
175 /* And add the comment */
176 while (fgets(comment, sizeof(comment), stdin) != NULL)
177 add_buffer(&buffer, &size, "%s", comment);
179 write_sha1_file(buffer, size, "commit", commit_sha1);
180 printf("%s\n", sha1_to_hex(commit_sha1));
181 return 0;