]>
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" | |
6d96ac18 | 9 | #include "builtin.h" |
e83c5163 | 10 | |
e83c5163 | 11 | #define BLOCKING (1ul << 14) |
e83c5163 LT |
12 | |
13 | /* | |
e83c5163 LT |
14 | * FIXME! Share the code with "write-tree.c" |
15 | */ | |
16 | static void init_buffer(char **bufp, unsigned int *sizep) | |
17 | { | |
812666c8 | 18 | char *buf = xmalloc(BLOCKING); |
a44c9a5e | 19 | *sizep = 0; |
e83c5163 LT |
20 | *bufp = buf; |
21 | } | |
22 | ||
23 | static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...) | |
24 | { | |
25 | char one_line[2048]; | |
26 | va_list args; | |
27 | int len; | |
28 | unsigned long alloc, size, newsize; | |
29 | char *buf; | |
30 | ||
31 | va_start(args, fmt); | |
32 | len = vsnprintf(one_line, sizeof(one_line), fmt, args); | |
33 | va_end(args); | |
34 | size = *sizep; | |
35 | newsize = size + len; | |
36 | alloc = (size + 32767) & ~32767; | |
37 | buf = *bufp; | |
38 | if (newsize > alloc) { | |
aebb2679 | 39 | alloc = (newsize + 32767) & ~32767; |
812666c8 | 40 | buf = xrealloc(buf, alloc); |
e83c5163 LT |
41 | *bufp = buf; |
42 | } | |
43 | *sizep = newsize; | |
44 | memcpy(buf + size, one_line, len); | |
45 | } | |
46 | ||
d0d7cbe7 LT |
47 | static void check_valid(unsigned char *sha1, const char *expect) |
48 | { | |
d0d7cbe7 | 49 | char type[20]; |
d0d7cbe7 | 50 | |
5981e099 JH |
51 | if (sha1_object_info(sha1, type, NULL)) |
52 | die("%s is not a valid object", sha1_to_hex(sha1)); | |
53 | if (expect && strcmp(type, expect)) | |
54 | die("%s is not a valid '%s' object", sha1_to_hex(sha1), | |
55 | expect); | |
d0d7cbe7 LT |
56 | } |
57 | ||
e83c5163 | 58 | /* |
c5bac17a JH |
59 | * Having more than two parents is not strange at all, and this is |
60 | * how multi-way merges are represented. | |
e83c5163 LT |
61 | */ |
62 | #define MAXPARENT (16) | |
b389237a | 63 | static unsigned char parent_sha1[MAXPARENT][20]; |
e83c5163 | 64 | |
4d1f1190 | 65 | static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog"; |
c5bac17a | 66 | |
b389237a LT |
67 | static int new_parent(int idx) |
68 | { | |
69 | int i; | |
70 | unsigned char *sha1 = parent_sha1[idx]; | |
71 | for (i = 0; i < idx; i++) { | |
a89fccd2 | 72 | if (!hashcmp(parent_sha1[i], sha1)) { |
b389237a LT |
73 | error("duplicate parent %s ignored", sha1_to_hex(sha1)); |
74 | return 0; | |
75 | } | |
76 | } | |
77 | return 1; | |
78 | } | |
79 | ||
a633fca0 | 80 | int cmd_commit_tree(int argc, const char **argv, const char *prefix) |
e83c5163 | 81 | { |
6aa33f40 | 82 | int i; |
e83c5163 LT |
83 | int parents = 0; |
84 | unsigned char tree_sha1[20]; | |
d6d3f9d0 | 85 | unsigned char commit_sha1[20]; |
e83c5163 | 86 | char comment[1000]; |
e83c5163 LT |
87 | char *buffer; |
88 | unsigned int size; | |
89 | ||
e1b10391 LT |
90 | setup_ident(); |
91 | git_config(git_default_config); | |
92 | ||
31fff305 | 93 | if (argc < 2) |
c5bac17a | 94 | usage(commit_tree_usage); |
31fff305 DL |
95 | if (get_sha1(argv[1], tree_sha1)) |
96 | die("Not a valid object name %s", argv[1]); | |
e83c5163 | 97 | |
8e440259 | 98 | check_valid(tree_sha1, tree_type); |
e83c5163 | 99 | for (i = 2; i < argc; i += 2) { |
6d96ac18 | 100 | const char *a, *b; |
e83c5163 | 101 | a = argv[i]; b = argv[i+1]; |
31fff305 | 102 | if (!b || strcmp(a, "-p")) |
c5bac17a | 103 | usage(commit_tree_usage); |
31fff305 DL |
104 | if (get_sha1(b, parent_sha1[parents])) |
105 | die("Not a valid object name %s", b); | |
8e440259 | 106 | check_valid(parent_sha1[parents], commit_type); |
b389237a LT |
107 | if (new_parent(parents)) |
108 | parents++; | |
e83c5163 LT |
109 | } |
110 | if (!parents) | |
111 | fprintf(stderr, "Committing initial tree %s\n", argv[1]); | |
e83c5163 LT |
112 | |
113 | init_buffer(&buffer, &size); | |
114 | add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1)); | |
115 | ||
116 | /* | |
117 | * NOTE! This ordering means that the same exact tree merged with a | |
118 | * different order of parents will be a _different_ changeset even | |
119 | * if everything else stays the same. | |
120 | */ | |
121 | for (i = 0; i < parents; i++) | |
122 | add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i])); | |
123 | ||
124 | /* Person/date information */ | |
749be728 JH |
125 | add_buffer(&buffer, &size, "author %s\n", git_author_info(1)); |
126 | add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info(1)); | |
e83c5163 LT |
127 | |
128 | /* And add the comment */ | |
129 | while (fgets(comment, sizeof(comment), stdin) != NULL) | |
130 | add_buffer(&buffer, &size, "%s", comment); | |
131 | ||
8e440259 | 132 | if (!write_sha1_file(buffer, size, commit_type, commit_sha1)) { |
7561d9f5 JH |
133 | printf("%s\n", sha1_to_hex(commit_sha1)); |
134 | return 0; | |
135 | } | |
136 | else | |
137 | return 1; | |
e83c5163 | 138 | } |