]>
Commit | Line | Data |
---|---|---|
8bc9a0c7 LT |
1 | /* |
2 | * GIT - The information manager from hell | |
3 | * | |
4 | * Copyright (C) Linus Torvalds, 2005 | |
5 | */ | |
e83c5163 | 6 | #include "cache.h" |
8e440259 PE |
7 | #include "commit.h" |
8 | #include "tree.h" | |
e83c5163 | 9 | |
e83c5163 | 10 | #define BLOCKING (1ul << 14) |
e83c5163 LT |
11 | |
12 | /* | |
e83c5163 LT |
13 | * FIXME! Share the code with "write-tree.c" |
14 | */ | |
15 | static void init_buffer(char **bufp, unsigned int *sizep) | |
16 | { | |
812666c8 | 17 | char *buf = xmalloc(BLOCKING); |
a44c9a5e | 18 | *sizep = 0; |
e83c5163 LT |
19 | *bufp = buf; |
20 | } | |
21 | ||
22 | static 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) { | |
aebb2679 | 38 | alloc = (newsize + 32767) & ~32767; |
812666c8 | 39 | buf = xrealloc(buf, alloc); |
e83c5163 LT |
40 | *bufp = buf; |
41 | } | |
42 | *sizep = newsize; | |
43 | memcpy(buf + size, one_line, len); | |
44 | } | |
45 | ||
d0d7cbe7 LT |
46 | static void check_valid(unsigned char *sha1, const char *expect) |
47 | { | |
d0d7cbe7 | 48 | char type[20]; |
d0d7cbe7 | 49 | |
5981e099 JH |
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); | |
d0d7cbe7 LT |
55 | } |
56 | ||
e83c5163 | 57 | /* |
c5bac17a JH |
58 | * Having more than two parents is not strange at all, and this is |
59 | * how multi-way merges are represented. | |
e83c5163 LT |
60 | */ |
61 | #define MAXPARENT (16) | |
b389237a | 62 | static unsigned char parent_sha1[MAXPARENT][20]; |
e83c5163 | 63 | |
4d1f1190 | 64 | static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog"; |
c5bac17a | 65 | |
b389237a LT |
66 | static 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 | ||
e83c5163 LT |
79 | int main(int argc, char **argv) |
80 | { | |
6aa33f40 | 81 | int i; |
e83c5163 LT |
82 | int parents = 0; |
83 | unsigned char tree_sha1[20]; | |
d6d3f9d0 | 84 | unsigned char commit_sha1[20]; |
e83c5163 | 85 | char comment[1000]; |
e83c5163 LT |
86 | char *buffer; |
87 | unsigned int size; | |
88 | ||
e1b10391 | 89 | setup_ident(); |
ce1610ea JH |
90 | setup_git_directory(); |
91 | ||
e1b10391 LT |
92 | git_config(git_default_config); |
93 | ||
31fff305 | 94 | if (argc < 2) |
c5bac17a | 95 | usage(commit_tree_usage); |
31fff305 DL |
96 | if (get_sha1(argv[1], tree_sha1)) |
97 | die("Not a valid object name %s", argv[1]); | |
e83c5163 | 98 | |
8e440259 | 99 | check_valid(tree_sha1, tree_type); |
e83c5163 LT |
100 | for (i = 2; i < argc; i += 2) { |
101 | char *a, *b; | |
102 | a = argv[i]; b = argv[i+1]; | |
31fff305 | 103 | if (!b || strcmp(a, "-p")) |
c5bac17a | 104 | usage(commit_tree_usage); |
31fff305 DL |
105 | if (get_sha1(b, parent_sha1[parents])) |
106 | die("Not a valid object name %s", b); | |
8e440259 | 107 | check_valid(parent_sha1[parents], commit_type); |
b389237a LT |
108 | if (new_parent(parents)) |
109 | parents++; | |
e83c5163 LT |
110 | } |
111 | if (!parents) | |
112 | fprintf(stderr, "Committing initial tree %s\n", argv[1]); | |
e83c5163 LT |
113 | |
114 | init_buffer(&buffer, &size); | |
115 | add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1)); | |
116 | ||
117 | /* | |
118 | * NOTE! This ordering means that the same exact tree merged with a | |
119 | * different order of parents will be a _different_ changeset even | |
120 | * if everything else stays the same. | |
121 | */ | |
122 | for (i = 0; i < parents; i++) | |
123 | add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i])); | |
124 | ||
125 | /* Person/date information */ | |
749be728 JH |
126 | add_buffer(&buffer, &size, "author %s\n", git_author_info(1)); |
127 | add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info(1)); | |
e83c5163 LT |
128 | |
129 | /* And add the comment */ | |
130 | while (fgets(comment, sizeof(comment), stdin) != NULL) | |
131 | add_buffer(&buffer, &size, "%s", comment); | |
132 | ||
8e440259 | 133 | if (!write_sha1_file(buffer, size, commit_type, commit_sha1)) { |
7561d9f5 JH |
134 | printf("%s\n", sha1_to_hex(commit_sha1)); |
135 | return 0; | |
136 | } | |
137 | else | |
138 | return 1; | |
e83c5163 | 139 | } |