]>
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" |
9e832665 | 10 | #include "utf8.h" |
e83c5163 | 11 | |
e83c5163 | 12 | #define BLOCKING (1ul << 14) |
e83c5163 LT |
13 | |
14 | /* | |
e83c5163 LT |
15 | * FIXME! Share the code with "write-tree.c" |
16 | */ | |
66035a6b | 17 | static void check_valid(unsigned char *sha1, enum object_type expect) |
d0d7cbe7 | 18 | { |
21666f1a NP |
19 | enum object_type type = sha1_object_info(sha1, NULL); |
20 | if (type < 0) | |
5981e099 | 21 | die("%s is not a valid object", sha1_to_hex(sha1)); |
66035a6b | 22 | if (type != expect) |
5981e099 | 23 | die("%s is not a valid '%s' object", sha1_to_hex(sha1), |
66035a6b | 24 | typename(expect)); |
d0d7cbe7 LT |
25 | } |
26 | ||
4d1f1190 | 27 | static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog"; |
c5bac17a | 28 | |
ef98c5ca | 29 | static void new_parent(struct commit *parent, struct commit_list **parents_p) |
b389237a | 30 | { |
ef98c5ca JS |
31 | unsigned char *sha1 = parent->object.sha1; |
32 | struct commit_list *parents; | |
33 | for (parents = *parents_p; parents; parents = parents->next) { | |
34 | if (parents->item == parent) { | |
b389237a | 35 | error("duplicate parent %s ignored", sha1_to_hex(sha1)); |
ef98c5ca | 36 | return; |
b389237a | 37 | } |
ef98c5ca | 38 | parents_p = &parents->next; |
b389237a | 39 | } |
ef98c5ca | 40 | commit_list_insert(parent, parents_p); |
b389237a LT |
41 | } |
42 | ||
9e832665 JS |
43 | static const char commit_utf8_warn[] = |
44 | "Warning: commit message does not conform to UTF-8.\n" | |
45 | "You may want to amend it after fixing the message, or set the config\n" | |
46 | "variable i18n.commitencoding to the encoding your project uses.\n"; | |
47 | ||
a633fca0 | 48 | int cmd_commit_tree(int argc, const char **argv, const char *prefix) |
e83c5163 | 49 | { |
6aa33f40 | 50 | int i; |
ef98c5ca | 51 | struct commit_list *parents = NULL; |
e83c5163 | 52 | unsigned char tree_sha1[20]; |
d6d3f9d0 | 53 | unsigned char commit_sha1[20]; |
af6eb822 | 54 | struct strbuf buffer; |
4b2bced5 | 55 | int encoding_is_utf8; |
e83c5163 | 56 | |
ef90d6d4 | 57 | git_config(git_default_config, NULL); |
e1b10391 | 58 | |
31fff305 | 59 | if (argc < 2) |
c5bac17a | 60 | usage(commit_tree_usage); |
31fff305 DL |
61 | if (get_sha1(argv[1], tree_sha1)) |
62 | die("Not a valid object name %s", argv[1]); | |
e83c5163 | 63 | |
66035a6b | 64 | check_valid(tree_sha1, OBJ_TREE); |
e83c5163 | 65 | for (i = 2; i < argc; i += 2) { |
ef98c5ca | 66 | unsigned char sha1[20]; |
6d96ac18 | 67 | const char *a, *b; |
e83c5163 | 68 | a = argv[i]; b = argv[i+1]; |
31fff305 | 69 | if (!b || strcmp(a, "-p")) |
c5bac17a | 70 | usage(commit_tree_usage); |
2295e8d0 | 71 | |
ef98c5ca | 72 | if (get_sha1(b, sha1)) |
31fff305 | 73 | die("Not a valid object name %s", b); |
ef98c5ca JS |
74 | check_valid(sha1, OBJ_COMMIT); |
75 | new_parent(lookup_commit(sha1), &parents); | |
e83c5163 | 76 | } |
e83c5163 | 77 | |
d2c11a38 | 78 | /* Not having i18n.commitencoding is the same as having utf-8 */ |
677cfed5 | 79 | encoding_is_utf8 = is_encoding_utf8(git_commit_encoding); |
4b2bced5 | 80 | |
f1696ee3 | 81 | strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */ |
af6eb822 | 82 | strbuf_addf(&buffer, "tree %s\n", sha1_to_hex(tree_sha1)); |
e83c5163 LT |
83 | |
84 | /* | |
85 | * NOTE! This ordering means that the same exact tree merged with a | |
86 | * different order of parents will be a _different_ changeset even | |
87 | * if everything else stays the same. | |
88 | */ | |
ef98c5ca JS |
89 | while (parents) { |
90 | struct commit_list *next = parents->next; | |
91 | strbuf_addf(&buffer, "parent %s\n", | |
92 | sha1_to_hex(parents->item->object.sha1)); | |
93 | free(parents); | |
94 | parents = next; | |
95 | } | |
e83c5163 LT |
96 | |
97 | /* Person/date information */ | |
774751a8 JH |
98 | strbuf_addf(&buffer, "author %s\n", git_author_info(IDENT_ERROR_ON_NO_NAME)); |
99 | strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_ERROR_ON_NO_NAME)); | |
4b2bced5 | 100 | if (!encoding_is_utf8) |
af6eb822 PH |
101 | strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding); |
102 | strbuf_addch(&buffer, '\n'); | |
e83c5163 LT |
103 | |
104 | /* And add the comment */ | |
f1696ee3 | 105 | if (strbuf_read(&buffer, 0, 0) < 0) |
af6eb822 | 106 | die("git-commit-tree: read returned %s", strerror(errno)); |
e83c5163 | 107 | |
9e832665 | 108 | /* And check the encoding */ |
af6eb822 | 109 | if (encoding_is_utf8 && !is_utf8(buffer.buf)) |
9e832665 JS |
110 | fprintf(stderr, commit_utf8_warn); |
111 | ||
af6eb822 | 112 | if (!write_sha1_file(buffer.buf, buffer.len, commit_type, commit_sha1)) { |
7561d9f5 JH |
113 | printf("%s\n", sha1_to_hex(commit_sha1)); |
114 | return 0; | |
115 | } | |
116 | else | |
117 | return 1; | |
e83c5163 | 118 | } |