🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v1.3.2 / . / commit-tree.c
blob: 25958509703f7e46dc0b1a4bffd7be8ba2897cf9 [file] [log] [blame]
Linus Torvalds8bc9a0c2005-04-07 22:16:10[diff] [blame]1/*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]6#include "cache.h"
Peter Eriksen8e440252006-04-02 12:44:09[diff] [blame]7#include "commit.h"
8#include "tree.h"
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]9
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]10#define BLOCKING (1ul << 14)
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]11
12/*
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]13 * FIXME! Share the code with "write-tree.c"
14 */
15static void init_buffer(char **bufp, unsigned int *sizep)
16{
Christopher Li812666c2005-04-26 19:00:58[diff] [blame]17 char *buf = xmalloc(BLOCKING);
Linus Torvaldsa44c9a52005-04-25 17:19:53[diff] [blame]18 *sizep = 0;
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]19 *bufp = buf;
20}
21
22static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
23{
24 char one_line[2048];
25 va_list args;
26 int len;
27 unsigned long alloc, size, newsize;
28 char *buf;
29
30 va_start(args, fmt);
31 len = vsnprintf(one_line, sizeof(one_line), fmt, args);
32 va_end(args);
33 size = *sizep;
34 newsize = size + len;
35 alloc = (size + 32767) & ~32767;
36 buf = *bufp;
37 if (newsize > alloc) {
Ingo Molnaraebb2672005-04-12 18:36:26[diff] [blame]38 alloc = (newsize + 32767) & ~32767;
Christopher Li812666c2005-04-26 19:00:58[diff] [blame]39 buf = xrealloc(buf, alloc);
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]40 *bufp = buf;
41 }
42 *sizep = newsize;
43 memcpy(buf + size, one_line, len);
44}
45
Linus Torvaldsd0d7cbe2005-04-17 22:26:13[diff] [blame]46static void check_valid(unsigned char *sha1, const char *expect)
47{
Linus Torvaldsd0d7cbe2005-04-17 22:26:13[diff] [blame]48 char type[20];
Linus Torvaldsd0d7cbe2005-04-17 22:26:13[diff] [blame]49
Junio C Hamano5981e092006-04-26 23:55:25[diff] [blame]50 if (sha1_object_info(sha1, type, NULL))
51 die("%s is not a valid object", sha1_to_hex(sha1));
52 if (expect && strcmp(type, expect))
53 die("%s is not a valid '%s' object", sha1_to_hex(sha1),
54 expect);
Linus Torvaldsd0d7cbe2005-04-17 22:26:13[diff] [blame]55}
56
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]57/*
Junio C Hamanoc5bac172005-04-21 02:49:16[diff] [blame]58 * Having more than two parents is not strange at all, and this is
59 * how multi-way merges are represented.
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]60 */
61#define MAXPARENT (16)
Linus Torvaldsb3892372005-06-19 17:40:10[diff] [blame]62static unsigned char parent_sha1[MAXPARENT][20];
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]63
Petr Baudis4d1f1192005-07-29 09:01:26[diff] [blame]64static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
Junio C Hamanoc5bac172005-04-21 02:49:16[diff] [blame]65
Linus Torvaldsb3892372005-06-19 17:40:10[diff] [blame]66static int new_parent(int idx)
67{
68 int i;
69 unsigned char *sha1 = parent_sha1[idx];
70 for (i = 0; i < idx; i++) {
71 if (!memcmp(parent_sha1[i], sha1, 20)) {
72 error("duplicate parent %s ignored", sha1_to_hex(sha1));
73 return 0;
74 }
75 }
76 return 1;
77}
78
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]79int main(int argc, char **argv)
80{
Linus Torvalds6aa33f42005-07-12 18:49:27[diff] [blame]81 int i;
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]82 int parents = 0;
83 unsigned char tree_sha1[20];
Linus Torvaldsd6d3f9d2005-04-10 00:09:34[diff] [blame]84 unsigned char commit_sha1[20];
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]85 char comment[1000];
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]86 char *buffer;
87 unsigned int size;
88
Linus Torvaldse1b10392005-10-12 01:47:34[diff] [blame]89 setup_ident();
Junio C Hamanoce1610e2006-02-09 22:41:39[diff] [blame]90 setup_git_directory();
91
Linus Torvaldse1b10392005-10-12 01:47:34[diff] [blame]92 git_config(git_default_config);
93
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]94 if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
Junio C Hamanoc5bac172005-04-21 02:49:16[diff] [blame]95 usage(commit_tree_usage);
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]96
Peter Eriksen8e440252006-04-02 12:44:09[diff] [blame]97 check_valid(tree_sha1, tree_type);
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]98 for (i = 2; i < argc; i += 2) {
99 char *a, *b;
100 a = argv[i]; b = argv[i+1];
Linus Torvalds3c249c92005-05-01 23:36:56[diff] [blame]101 if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
Junio C Hamanoc5bac172005-04-21 02:49:16[diff] [blame]102 usage(commit_tree_usage);
Peter Eriksen8e440252006-04-02 12:44:09[diff] [blame]103 check_valid(parent_sha1[parents], commit_type);
Linus Torvaldsb3892372005-06-19 17:40:10[diff] [blame]104 if (new_parent(parents))
105 parents++;
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]106 }
107 if (!parents)
108 fprintf(stderr, "Committing initial tree %s\n", argv[1]);
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]109
110 init_buffer(&buffer, &size);
111 add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));
112
113 /*
114 * NOTE! This ordering means that the same exact tree merged with a
115 * different order of parents will be a _different_ changeset even
116 * if everything else stays the same.
117 */
118 for (i = 0; i < parents; i++)
119 add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i]));
120
121 /* Person/date information */
Junio C Hamano749be722006-02-19 04:31:05[diff] [blame]122 add_buffer(&buffer, &size, "author %s\n", git_author_info(1));
123 add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info(1));
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]124
125 /* And add the comment */
126 while (fgets(comment, sizeof(comment), stdin) != NULL)
127 add_buffer(&buffer, &size, "%s", comment);
128
Peter Eriksen8e440252006-04-02 12:44:09[diff] [blame]129 if (!write_sha1_file(buffer, size, commit_type, commit_sha1)) {
Junio C Hamano7561d9f2006-03-25 06:23:25[diff] [blame]130 printf("%s\n", sha1_to_hex(commit_sha1));
131 return 0;
132 }
133 else
134 return 1;
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]135}