]>
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 | ||
8 | #include <pwd.h> | |
9 | #include <time.h> | |
27de946d | 10 | #include <ctype.h> |
e83c5163 LT |
11 | |
12 | #define BLOCKING (1ul << 14) | |
e83c5163 LT |
13 | |
14 | /* | |
e83c5163 LT |
15 | * FIXME! Share the code with "write-tree.c" |
16 | */ | |
17 | static void init_buffer(char **bufp, unsigned int *sizep) | |
18 | { | |
812666c8 | 19 | char *buf = xmalloc(BLOCKING); |
a44c9a5e | 20 | *sizep = 0; |
e83c5163 LT |
21 | *bufp = buf; |
22 | } | |
23 | ||
24 | static 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) { | |
aebb2679 | 40 | alloc = (newsize + 32767) & ~32767; |
812666c8 | 41 | buf = xrealloc(buf, alloc); |
e83c5163 LT |
42 | *bufp = buf; |
43 | } | |
44 | *sizep = newsize; | |
45 | memcpy(buf + size, one_line, len); | |
46 | } | |
47 | ||
d0d7cbe7 LT |
48 | static void check_valid(unsigned char *sha1, const char *expect) |
49 | { | |
50 | void *buf; | |
51 | char type[20]; | |
52 | unsigned long size; | |
53 | ||
54 | buf = read_sha1_file(sha1, type, &size); | |
55 | if (!buf || strcmp(type, expect)) | |
56 | die("%s is not a valid '%s' object", sha1_to_hex(sha1), expect); | |
57 | free(buf); | |
58 | } | |
59 | ||
e83c5163 | 60 | /* |
c5bac17a JH |
61 | * Having more than two parents is not strange at all, and this is |
62 | * how multi-way merges are represented. | |
e83c5163 LT |
63 | */ |
64 | #define MAXPARENT (16) | |
b389237a | 65 | static unsigned char parent_sha1[MAXPARENT][20]; |
e83c5163 | 66 | |
4d1f1190 | 67 | static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog"; |
c5bac17a | 68 | |
b389237a LT |
69 | static int new_parent(int idx) |
70 | { | |
71 | int i; | |
72 | unsigned char *sha1 = parent_sha1[idx]; | |
73 | for (i = 0; i < idx; i++) { | |
74 | if (!memcmp(parent_sha1[i], sha1, 20)) { | |
75 | error("duplicate parent %s ignored", sha1_to_hex(sha1)); | |
76 | return 0; | |
77 | } | |
78 | } | |
79 | return 1; | |
80 | } | |
81 | ||
e83c5163 LT |
82 | int main(int argc, char **argv) |
83 | { | |
6aa33f40 | 84 | int i; |
e83c5163 LT |
85 | int parents = 0; |
86 | unsigned char tree_sha1[20]; | |
d6d3f9d0 | 87 | unsigned char commit_sha1[20]; |
e83c5163 | 88 | char comment[1000]; |
e83c5163 LT |
89 | char *buffer; |
90 | unsigned int size; | |
91 | ||
92 | if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0) | |
c5bac17a | 93 | usage(commit_tree_usage); |
e83c5163 | 94 | |
d0d7cbe7 | 95 | check_valid(tree_sha1, "tree"); |
e83c5163 LT |
96 | for (i = 2; i < argc; i += 2) { |
97 | char *a, *b; | |
98 | a = argv[i]; b = argv[i+1]; | |
3c249c95 | 99 | if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents])) |
c5bac17a | 100 | usage(commit_tree_usage); |
d0d7cbe7 | 101 | check_valid(parent_sha1[parents], "commit"); |
b389237a LT |
102 | if (new_parent(parents)) |
103 | parents++; | |
e83c5163 LT |
104 | } |
105 | if (!parents) | |
106 | fprintf(stderr, "Committing initial tree %s\n", argv[1]); | |
6aa33f40 | 107 | setup_ident(); |
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 | } |