blob: 0d504e7e4be10083da6e677bbcb95bc186fc6277 [file] [log] [blame]
Linus Torvalds8bc9a0c2005-04-07 15:16:10 -07001/*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
Linus Torvaldse83c5162005-04-07 15:13:13 -07006#include "cache.h"
7
8#include <pwd.h>
9#include <time.h>
David Woodhouse27de9462005-04-15 08:39:57 -070010#include <ctype.h>
Linus Torvaldse83c5162005-04-07 15:13:13 -070011
12#define BLOCKING (1ul << 14)
Linus Torvaldse83c5162005-04-07 15:13:13 -070013
14/*
Linus Torvaldse83c5162005-04-07 15:13:13 -070015 * FIXME! Share the code with "write-tree.c"
16 */
17static void init_buffer(char **bufp, unsigned int *sizep)
18{
Christopher Li812666c2005-04-26 12:00:58 -070019 char *buf = xmalloc(BLOCKING);
Linus Torvaldsa44c9a52005-04-25 10:19:53 -070020 *sizep = 0;
Linus Torvaldse83c5162005-04-07 15:13:13 -070021 *bufp = buf;
22}
23
24static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
25{
26 char one_line[2048];
27 va_list args;
28 int len;
29 unsigned long alloc, size, newsize;
30 char *buf;
31
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;
37 alloc = (size + 32767) & ~32767;
38 buf = *bufp;
39 if (newsize > alloc) {
Ingo Molnaraebb2672005-04-12 11:36:26 -070040 alloc = (newsize + 32767) & ~32767;
Christopher Li812666c2005-04-26 12:00:58 -070041 buf = xrealloc(buf, alloc);
Linus Torvaldse83c5162005-04-07 15:13:13 -070042 *bufp = buf;
43 }
44 *sizep = newsize;
45 memcpy(buf + size, one_line, len);
46}
47
Linus Torvaldse83c5162005-04-07 15:13:13 -070048static void remove_special(char *p)
49{
50 char c;
Brad Roberts74b24282005-04-17 19:12:14 -070051 char *dst = p, *src = p;
Linus Torvaldse83c5162005-04-07 15:13:13 -070052
53 for (;;) {
Brad Roberts74b24282005-04-17 19:12:14 -070054 c = *src;
55 src++;
Linus Torvaldse83c5162005-04-07 15:13:13 -070056 switch(c) {
57 case '\n': case '<': case '>':
58 continue;
59 }
60 *dst++ = c;
61 if (!c)
62 break;
63 }
Linus Torvalds5e5128e2005-04-17 16:52:54 -070064
65 /*
66 * Go back, and remove crud from the end: some people
67 * have commas etc in their gecos field
68 */
69 dst--;
70 while (--dst >= p) {
71 unsigned char c = *dst;
72 switch (c) {
73 case ',': case ';': case '.':
74 *dst = 0;
75 continue;
76 }
77 break;
78 }
Linus Torvaldse83c5162005-04-07 15:13:13 -070079}
80
Linus Torvaldsd0d7cbe2005-04-17 15:26:13 -070081static void check_valid(unsigned char *sha1, const char *expect)
82{
83 void *buf;
84 char type[20];
85 unsigned long size;
86
87 buf = read_sha1_file(sha1, type, &size);
88 if (!buf || strcmp(type, expect))
89 die("%s is not a valid '%s' object", sha1_to_hex(sha1), expect);
90 free(buf);
91}
92
Linus Torvaldse83c5162005-04-07 15:13:13 -070093/*
Junio C Hamanoc5bac172005-04-20 19:49:16 -070094 * Having more than two parents is not strange at all, and this is
95 * how multi-way merges are represented.
Linus Torvaldse83c5162005-04-07 15:13:13 -070096 */
97#define MAXPARENT (16)
Linus Torvaldsb3892372005-06-19 10:40:10 -070098static unsigned char parent_sha1[MAXPARENT][20];
Linus Torvaldse83c5162005-04-07 15:13:13 -070099
Alexey Nezhdanov667bb592005-05-19 15:17:16 +0400100static char *commit_tree_usage = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
Junio C Hamanoc5bac172005-04-20 19:49:16 -0700101
Linus Torvaldsb3892372005-06-19 10:40:10 -0700102static int new_parent(int idx)
103{
104 int i;
105 unsigned char *sha1 = parent_sha1[idx];
106 for (i = 0; i < idx; i++) {
107 if (!memcmp(parent_sha1[i], sha1, 20)) {
108 error("duplicate parent %s ignored", sha1_to_hex(sha1));
109 return 0;
110 }
111 }
112 return 1;
113}
114
Linus Torvaldse83c5162005-04-07 15:13:13 -0700115int main(int argc, char **argv)
116{
117 int i, len;
118 int parents = 0;
119 unsigned char tree_sha1[20];
Linus Torvaldsd6d3f9d2005-04-09 17:09:34 -0700120 unsigned char commit_sha1[20];
Greg KHb70070f2005-04-18 17:37:32 -0700121 char *gecos, *realgecos, *commitgecos;
122 char *email, *commitemail, realemail[1000];
Linus Torvaldsc4bd9072005-05-24 10:21:13 -0700123 char date[50], realdate[50];
124 char *audate, *cmdate;
Linus Torvaldse83c5162005-04-07 15:13:13 -0700125 char comment[1000];
126 struct passwd *pw;
Linus Torvaldse83c5162005-04-07 15:13:13 -0700127 char *buffer;
128 unsigned int size;
129
130 if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
Junio C Hamanoc5bac172005-04-20 19:49:16 -0700131 usage(commit_tree_usage);
Linus Torvaldse83c5162005-04-07 15:13:13 -0700132
Linus Torvaldsd0d7cbe2005-04-17 15:26:13 -0700133 check_valid(tree_sha1, "tree");
Linus Torvaldse83c5162005-04-07 15:13:13 -0700134 for (i = 2; i < argc; i += 2) {
135 char *a, *b;
136 a = argv[i]; b = argv[i+1];
Linus Torvalds3c249c92005-05-01 16:36:56 -0700137 if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
Junio C Hamanoc5bac172005-04-20 19:49:16 -0700138 usage(commit_tree_usage);
Linus Torvaldsd0d7cbe2005-04-17 15:26:13 -0700139 check_valid(parent_sha1[parents], "commit");
Linus Torvaldsb3892372005-06-19 10:40:10 -0700140 if (new_parent(parents))
141 parents++;
Linus Torvaldse83c5162005-04-07 15:13:13 -0700142 }
143 if (!parents)
144 fprintf(stderr, "Committing initial tree %s\n", argv[1]);
145 pw = getpwuid(getuid());
146 if (!pw)
Petr Baudis2de381f2005-04-13 02:28:48 -0700147 die("You don't exist. Go away!");
Linus Torvaldse83c5162005-04-07 15:13:13 -0700148 realgecos = pw->pw_gecos;
149 len = strlen(pw->pw_name);
150 memcpy(realemail, pw->pw_name, len);
151 realemail[len] = '@';
152 gethostname(realemail+len+1, sizeof(realemail)-len-1);
Linus Torvaldsb96afa52005-04-19 15:46:06 -0700153 if (!strchr(realemail+len+1, '.')) {
154 strcat(realemail, ".");
155 getdomainname(realemail+strlen(realemail), sizeof(realemail)-strlen(realemail)-1);
156 }
David Woodhouse27de9462005-04-15 08:39:57 -0700157
Edgar Toernigecee9d92005-04-30 09:46:49 -0700158 datestamp(realdate, sizeof(realdate));
David Woodhouse27de9462005-04-15 08:39:57 -0700159 strcpy(date, realdate);
Linus Torvaldse83c5162005-04-07 15:13:13 -0700160
Junio C Hamanod19938a2005-05-09 17:57:56 -0700161 commitgecos = gitenv("GIT_COMMITTER_NAME") ? : realgecos;
162 commitemail = gitenv("GIT_COMMITTER_EMAIL") ? : realemail;
163 gecos = gitenv("GIT_AUTHOR_NAME") ? : realgecos;
164 email = gitenv("GIT_AUTHOR_EMAIL") ? : realemail;
165 audate = gitenv("GIT_AUTHOR_DATE");
David Woodhouse27de9462005-04-15 08:39:57 -0700166 if (audate)
Edgar Toernigecee9d92005-04-30 09:46:49 -0700167 parse_date(audate, date, sizeof(date));
Linus Torvaldsc4bd9072005-05-24 10:21:13 -0700168 cmdate = gitenv("GIT_COMMITTER_DATE");
169 if (cmdate)
Rene Scharfec504aae2005-05-27 01:03:26 +0200170 parse_date(cmdate, realdate, sizeof(realdate));
Linus Torvaldse83c5162005-04-07 15:13:13 -0700171
Greg KHb70070f2005-04-18 17:37:32 -0700172 remove_special(gecos); remove_special(realgecos); remove_special(commitgecos);
173 remove_special(email); remove_special(realemail); remove_special(commitemail);
Linus Torvaldse83c5162005-04-07 15:13:13 -0700174
175 init_buffer(&buffer, &size);
176 add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));
177
178 /*
179 * NOTE! This ordering means that the same exact tree merged with a
180 * different order of parents will be a _different_ changeset even
181 * if everything else stays the same.
182 */
183 for (i = 0; i < parents; i++)
184 add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i]));
185
186 /* Person/date information */
187 add_buffer(&buffer, &size, "author %s <%s> %s\n", gecos, email, date);
Greg KHb70070f2005-04-18 17:37:32 -0700188 add_buffer(&buffer, &size, "committer %s <%s> %s\n\n", commitgecos, commitemail, realdate);
Linus Torvaldse83c5162005-04-07 15:13:13 -0700189
190 /* And add the comment */
191 while (fgets(comment, sizeof(comment), stdin) != NULL)
192 add_buffer(&buffer, &size, "%s", comment);
193
Linus Torvaldsa44c9a52005-04-25 10:19:53 -0700194 write_sha1_file(buffer, size, "commit", commit_sha1);
Linus Torvaldsd6d3f9d2005-04-09 17:09:34 -0700195 printf("%s\n", sha1_to_hex(commit_sha1));
Linus Torvaldse83c5162005-04-07 15:13:13 -0700196 return 0;
197}