🌐 AI搜索 & 代理 主页
blob: 4634b50e6aa8bb214da7ebf41d2a8cf34028f531 [file] [log] [blame]
Linus Torvalds8bc9a0c2005-04-07 22:16:101/*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
Linus Torvaldse83c5162005-04-07 22:13:136#include "cache.h"
7
Linus Torvaldse83c5162005-04-07 22:13:138#define BLOCKING (1ul << 14)
Linus Torvaldse83c5162005-04-07 22:13:139
10/*
Linus Torvaldse83c5162005-04-07 22:13:1311 * FIXME! Share the code with "write-tree.c"
12 */
13static void init_buffer(char **bufp, unsigned int *sizep)
14{
Christopher Li812666c2005-04-26 19:00:5815 char *buf = xmalloc(BLOCKING);
Linus Torvaldsa44c9a52005-04-25 17:19:5316 *sizep = 0;
Linus Torvaldse83c5162005-04-07 22:13:1317 *bufp = buf;
18}
19
20static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
21{
22 char one_line[2048];
23 va_list args;
24 int len;
25 unsigned long alloc, size, newsize;
26 char *buf;
27
28 va_start(args, fmt);
29 len = vsnprintf(one_line, sizeof(one_line), fmt, args);
30 va_end(args);
31 size = *sizep;
32 newsize = size + len;
33 alloc = (size + 32767) & ~32767;
34 buf = *bufp;
35 if (newsize > alloc) {
Ingo Molnaraebb2672005-04-12 18:36:2636 alloc = (newsize + 32767) & ~32767;
Christopher Li812666c2005-04-26 19:00:5837 buf = xrealloc(buf, alloc);
Linus Torvaldse83c5162005-04-07 22:13:1338 *bufp = buf;
39 }
40 *sizep = newsize;
41 memcpy(buf + size, one_line, len);
42}
43
Linus Torvaldsd0d7cbe2005-04-17 22:26:1344static void check_valid(unsigned char *sha1, const char *expect)
45{
46 void *buf;
47 char type[20];
48 unsigned long size;
49
50 buf = read_sha1_file(sha1, type, &size);
51 if (!buf || strcmp(type, expect))
52 die("%s is not a valid '%s' object", sha1_to_hex(sha1), expect);
53 free(buf);
54}
55
Linus Torvaldse83c5162005-04-07 22:13:1356/*
Junio C Hamanoc5bac172005-04-21 02:49:1657 * Having more than two parents is not strange at all, and this is
58 * how multi-way merges are represented.
Linus Torvaldse83c5162005-04-07 22:13:1359 */
60#define MAXPARENT (16)
Linus Torvaldsb3892372005-06-19 17:40:1061static unsigned char parent_sha1[MAXPARENT][20];
Linus Torvaldse83c5162005-04-07 22:13:1362
Petr Baudis4d1f1192005-07-29 09:01:2663static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
Junio C Hamanoc5bac172005-04-21 02:49:1664
Linus Torvaldsb3892372005-06-19 17:40:1065static int new_parent(int idx)
66{
67 int i;
68 unsigned char *sha1 = parent_sha1[idx];
69 for (i = 0; i < idx; i++) {
70 if (!memcmp(parent_sha1[i], sha1, 20)) {
71 error("duplicate parent %s ignored", sha1_to_hex(sha1));
72 return 0;
73 }
74 }
75 return 1;
76}
77
Linus Torvaldse83c5162005-04-07 22:13:1378int main(int argc, char **argv)
79{
Linus Torvalds6aa33f42005-07-12 18:49:2780 int i;
Linus Torvaldse83c5162005-04-07 22:13:1381 int parents = 0;
82 unsigned char tree_sha1[20];
Linus Torvaldsd6d3f9d2005-04-10 00:09:3483 unsigned char commit_sha1[20];
Linus Torvaldse83c5162005-04-07 22:13:1384 char comment[1000];
Linus Torvaldse83c5162005-04-07 22:13:1385 char *buffer;
86 unsigned int size;
87
Linus Torvaldse1b10392005-10-12 01:47:3488 setup_ident();
89 git_config(git_default_config);
90
Linus Torvaldse83c5162005-04-07 22:13:1391 if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
Junio C Hamanoc5bac172005-04-21 02:49:1692 usage(commit_tree_usage);
Linus Torvaldse83c5162005-04-07 22:13:1393
Junio C Hamano53228a52005-11-26 08:50:0294 setup_git_directory();
95
Linus Torvaldsd0d7cbe2005-04-17 22:26:1396 check_valid(tree_sha1, "tree");
Linus Torvaldse83c5162005-04-07 22:13:1397 for (i = 2; i < argc; i += 2) {
98 char *a, *b;
99 a = argv[i]; b = argv[i+1];
Linus Torvalds3c249c92005-05-01 23:36:56100 if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
Junio C Hamanoc5bac172005-04-21 02:49:16101 usage(commit_tree_usage);
Linus Torvaldsd0d7cbe2005-04-17 22:26:13102 check_valid(parent_sha1[parents], "commit");
Linus Torvaldsb3892372005-06-19 17:40:10103 if (new_parent(parents))
104 parents++;
Linus Torvaldse83c5162005-04-07 22:13:13105 }
106 if (!parents)
107 fprintf(stderr, "Committing initial tree %s\n", argv[1]);
Linus Torvaldse83c5162005-04-07 22:13:13108
109 init_buffer(&buffer, &size);
110 add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));
111
112 /*
113 * NOTE! This ordering means that the same exact tree merged with a
114 * different order of parents will be a _different_ changeset even
115 * if everything else stays the same.
116 */
117 for (i = 0; i < parents; i++)
118 add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i]));
119
120 /* Person/date information */
Linus Torvalds6aa33f42005-07-12 18:49:27121 add_buffer(&buffer, &size, "author %s\n", git_author_info());
122 add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info());
Linus Torvaldse83c5162005-04-07 22:13:13123
124 /* And add the comment */
125 while (fgets(comment, sizeof(comment), stdin) != NULL)
126 add_buffer(&buffer, &size, "%s", comment);
127
Linus Torvaldsa44c9a52005-04-25 17:19:53128 write_sha1_file(buffer, size, "commit", commit_sha1);
Linus Torvaldsd6d3f9d2005-04-10 00:09:34129 printf("%s\n", sha1_to_hex(commit_sha1));
Linus Torvaldse83c5162005-04-07 22:13:13130 return 0;
131}