]>
Commit | Line | Data |
---|---|---|
8bc9a0c7 LT |
1 | /* |
2 | * GIT - The information manager from hell | |
3 | * | |
4 | * Copyright (C) Linus Torvalds, 2005 | |
5 | */ | |
e83c5163 LT |
6 | #include "cache.h" |
7 | ||
e83c5163 | 8 | #define BLOCKING (1ul << 14) |
e83c5163 LT |
9 | |
10 | /* | |
e83c5163 LT |
11 | * FIXME! Share the code with "write-tree.c" |
12 | */ | |
13 | static void init_buffer(char **bufp, unsigned int *sizep) | |
14 | { | |
812666c8 | 15 | char *buf = xmalloc(BLOCKING); |
a44c9a5e | 16 | *sizep = 0; |
e83c5163 LT |
17 | *bufp = buf; |
18 | } | |
19 | ||
20 | static 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) { | |
aebb2679 | 36 | alloc = (newsize + 32767) & ~32767; |
812666c8 | 37 | buf = xrealloc(buf, alloc); |
e83c5163 LT |
38 | *bufp = buf; |
39 | } | |
40 | *sizep = newsize; | |
41 | memcpy(buf + size, one_line, len); | |
42 | } | |
43 | ||
d0d7cbe7 LT |
44 | static 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 | ||
e83c5163 | 56 | /* |
c5bac17a JH |
57 | * Having more than two parents is not strange at all, and this is |
58 | * how multi-way merges are represented. | |
e83c5163 LT |
59 | */ |
60 | #define MAXPARENT (16) | |
b389237a | 61 | static unsigned char parent_sha1[MAXPARENT][20]; |
e83c5163 | 62 | |
4d1f1190 | 63 | static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog"; |
c5bac17a | 64 | |
b389237a LT |
65 | static 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 | ||
e83c5163 LT |
78 | int main(int argc, char **argv) |
79 | { | |
6aa33f40 | 80 | int i; |
e83c5163 LT |
81 | int parents = 0; |
82 | unsigned char tree_sha1[20]; | |
d6d3f9d0 | 83 | unsigned char commit_sha1[20]; |
e83c5163 | 84 | char comment[1000]; |
e83c5163 LT |
85 | char *buffer; |
86 | unsigned int size; | |
87 | ||
e1b10391 LT |
88 | setup_ident(); |
89 | git_config(git_default_config); | |
90 | ||
e83c5163 | 91 | if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0) |
c5bac17a | 92 | usage(commit_tree_usage); |
e83c5163 | 93 | |
53228a5f JH |
94 | setup_git_directory(); |
95 | ||
d0d7cbe7 | 96 | check_valid(tree_sha1, "tree"); |
e83c5163 LT |
97 | for (i = 2; i < argc; i += 2) { |
98 | char *a, *b; | |
99 | a = argv[i]; b = argv[i+1]; | |
3c249c95 | 100 | if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents])) |
c5bac17a | 101 | usage(commit_tree_usage); |
d0d7cbe7 | 102 | check_valid(parent_sha1[parents], "commit"); |
b389237a LT |
103 | if (new_parent(parents)) |
104 | parents++; | |
e83c5163 LT |
105 | } |
106 | if (!parents) | |
107 | fprintf(stderr, "Committing initial tree %s\n", argv[1]); | |
e83c5163 LT |
108 | |
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 */ | |
6aa33f40 LT |
121 | add_buffer(&buffer, &size, "author %s\n", git_author_info()); |
122 | add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info()); | |
e83c5163 LT |
123 | |
124 | /* And add the comment */ | |
125 | while (fgets(comment, sizeof(comment), stdin) != NULL) | |
126 | add_buffer(&buffer, &size, "%s", comment); | |
127 | ||
a44c9a5e | 128 | write_sha1_file(buffer, size, "commit", commit_sha1); |
d6d3f9d0 | 129 | printf("%s\n", sha1_to_hex(commit_sha1)); |
e83c5163 LT |
130 | return 0; |
131 | } |