blob: 2d8651894a20e752eb47e6da439ad3cee13c29c4 [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"
Peter Eriksen8e440252006-04-02 14:44:09 +02007#include "commit.h"
8#include "tree.h"
Linus Torvaldse83c5162005-04-07 15:13:13 -07009
Linus Torvaldse83c5162005-04-07 15:13:13 -070010#define BLOCKING (1ul << 14)
Linus Torvaldse83c5162005-04-07 15:13:13 -070011
12/*
Linus Torvaldse83c5162005-04-07 15:13:13 -070013 * FIXME! Share the code with "write-tree.c"
14 */
15static void init_buffer(char **bufp, unsigned int *sizep)
16{
Christopher Li812666c2005-04-26 12:00:58 -070017 char *buf = xmalloc(BLOCKING);
Linus Torvaldsa44c9a52005-04-25 10:19:53 -070018 *sizep = 0;
Linus Torvaldse83c5162005-04-07 15:13:13 -070019 *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 11:36:26 -070038 alloc = (newsize + 32767) & ~32767;
Christopher Li812666c2005-04-26 12:00:58 -070039 buf = xrealloc(buf, alloc);
Linus Torvaldse83c5162005-04-07 15:13:13 -070040 *bufp = buf;
41 }
42 *sizep = newsize;
43 memcpy(buf + size, one_line, len);
44}
45
Linus Torvaldsd0d7cbe2005-04-17 15:26:13 -070046static void check_valid(unsigned char *sha1, const char *expect)
47{
48 void *buf;
49 char type[20];
50 unsigned long size;
51
52 buf = read_sha1_file(sha1, type, &size);
53 if (!buf || strcmp(type, expect))
54 die("%s is not a valid '%s' object", sha1_to_hex(sha1), expect);
55 free(buf);
56}
57
Linus Torvaldse83c5162005-04-07 15:13:13 -070058/*
Junio C Hamanoc5bac172005-04-20 19:49:16 -070059 * Having more than two parents is not strange at all, and this is
60 * how multi-way merges are represented.
Linus Torvaldse83c5162005-04-07 15:13:13 -070061 */
62#define MAXPARENT (16)
Linus Torvaldsb3892372005-06-19 10:40:10 -070063static unsigned char parent_sha1[MAXPARENT][20];
Linus Torvaldse83c5162005-04-07 15:13:13 -070064
Petr Baudis4d1f1192005-07-29 11:01:26 +020065static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
Junio C Hamanoc5bac172005-04-20 19:49:16 -070066
Linus Torvaldsb3892372005-06-19 10:40:10 -070067static int new_parent(int idx)
68{
69 int i;
70 unsigned char *sha1 = parent_sha1[idx];
71 for (i = 0; i < idx; i++) {
72 if (!memcmp(parent_sha1[i], sha1, 20)) {
73 error("duplicate parent %s ignored", sha1_to_hex(sha1));
74 return 0;
75 }
76 }
77 return 1;
78}
79
Linus Torvaldse83c5162005-04-07 15:13:13 -070080int main(int argc, char **argv)
81{
Linus Torvalds6aa33f42005-07-12 11:49:27 -070082 int i;
Linus Torvaldse83c5162005-04-07 15:13:13 -070083 int parents = 0;
84 unsigned char tree_sha1[20];
Linus Torvaldsd6d3f9d2005-04-09 17:09:34 -070085 unsigned char commit_sha1[20];
Linus Torvaldse83c5162005-04-07 15:13:13 -070086 char comment[1000];
Linus Torvaldse83c5162005-04-07 15:13:13 -070087 char *buffer;
88 unsigned int size;
89
Linus Torvaldse1b10392005-10-11 18:47:34 -070090 setup_ident();
Junio C Hamanoce1610e2006-02-09 14:41:39 -080091 setup_git_directory();
92
Linus Torvaldse1b10392005-10-11 18:47:34 -070093 git_config(git_default_config);
94
Linus Torvaldse83c5162005-04-07 15:13:13 -070095 if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
Junio C Hamanoc5bac172005-04-20 19:49:16 -070096 usage(commit_tree_usage);
Linus Torvaldse83c5162005-04-07 15:13:13 -070097
Peter Eriksen8e440252006-04-02 14:44:09 +020098 check_valid(tree_sha1, tree_type);
Linus Torvaldse83c5162005-04-07 15:13:13 -070099 for (i = 2; i < argc; i += 2) {
100 char *a, *b;
101 a = argv[i]; b = argv[i+1];
Linus Torvalds3c249c92005-05-01 16:36:56 -0700102 if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
Junio C Hamanoc5bac172005-04-20 19:49:16 -0700103 usage(commit_tree_usage);
Peter Eriksen8e440252006-04-02 14:44:09 +0200104 check_valid(parent_sha1[parents], commit_type);
Linus Torvaldsb3892372005-06-19 10:40:10 -0700105 if (new_parent(parents))
106 parents++;
Linus Torvaldse83c5162005-04-07 15:13:13 -0700107 }
108 if (!parents)
109 fprintf(stderr, "Committing initial tree %s\n", argv[1]);
Linus Torvaldse83c5162005-04-07 15:13:13 -0700110
111 init_buffer(&buffer, &size);
112 add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));
113
114 /*
115 * NOTE! This ordering means that the same exact tree merged with a
116 * different order of parents will be a _different_ changeset even
117 * if everything else stays the same.
118 */
119 for (i = 0; i < parents; i++)
120 add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i]));
121
122 /* Person/date information */
Junio C Hamano749be722006-02-18 20:31:05 -0800123 add_buffer(&buffer, &size, "author %s\n", git_author_info(1));
124 add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info(1));
Linus Torvaldse83c5162005-04-07 15:13:13 -0700125
126 /* And add the comment */
127 while (fgets(comment, sizeof(comment), stdin) != NULL)
128 add_buffer(&buffer, &size, "%s", comment);
129
Peter Eriksen8e440252006-04-02 14:44:09 +0200130 if (!write_sha1_file(buffer, size, commit_type, commit_sha1)) {
Junio C Hamano7561d9f2006-03-24 22:23:25 -0800131 printf("%s\n", sha1_to_hex(commit_sha1));
132 return 0;
133 }
134 else
135 return 1;
Linus Torvaldse83c5162005-04-07 15:13:13 -0700136}