2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
12 static const char commit_tree_usage
[] = "git commit-tree [(-p <sha1>)...] [-m <message>] [-F <file>] <sha1> <changelog";
14 static void new_parent(struct commit
*parent
, struct commit_list
**parents_p
)
16 unsigned char *sha1
= parent
->object
.sha1
;
17 struct commit_list
*parents
;
18 for (parents
= *parents_p
; parents
; parents
= parents
->next
) {
19 if (parents
->item
== parent
) {
20 error("duplicate parent %s ignored", sha1_to_hex(sha1
));
23 parents_p
= &parents
->next
;
25 commit_list_insert(parent
, parents_p
);
28 int cmd_commit_tree(int argc
, const char **argv
, const char *prefix
)
31 struct commit_list
*parents
= NULL
;
32 unsigned char tree_sha1
[20];
33 unsigned char commit_sha1
[20];
34 struct strbuf buffer
= STRBUF_INIT
;
36 git_config(git_default_config
, NULL
);
38 if (argc
< 2 || !strcmp(argv
[1], "-h"))
39 usage(commit_tree_usage
);
41 for (i
= 1; i
< argc
; i
++) {
42 const char *arg
= argv
[i
];
43 if (!strcmp(arg
, "-p")) {
44 unsigned char sha1
[20];
46 usage(commit_tree_usage
);
47 if (get_sha1(argv
[i
], sha1
))
48 die("Not a valid object name %s", argv
[i
]);
49 assert_sha1_type(sha1
, OBJ_COMMIT
);
50 new_parent(lookup_commit(sha1
), &parents
);
54 if (!strcmp(arg
, "-m")) {
56 usage(commit_tree_usage
);
58 strbuf_addch(&buffer
, '\n');
59 strbuf_addstr(&buffer
, argv
[i
]);
60 strbuf_complete_line(&buffer
);
64 if (!strcmp(arg
, "-F")) {
68 usage(commit_tree_usage
);
70 strbuf_addch(&buffer
, '\n');
71 if (!strcmp(argv
[i
], "-"))
74 fd
= open(argv
[i
], O_RDONLY
);
76 die_errno("git commit-tree: failed to open '%s'",
79 if (strbuf_read(&buffer
, fd
, 0) < 0)
80 die_errno("git commit-tree: failed to read '%s'",
83 die_errno("git commit-tree: failed to close '%s'",
85 strbuf_complete_line(&buffer
);
89 if (get_sha1(arg
, tree_sha1
))
90 die("Not a valid object name %s", arg
);
92 die("Cannot give more than one trees");
97 if (strbuf_read(&buffer
, 0, 0) < 0)
98 die_errno("git commit-tree: failed to read");
101 if (commit_tree(buffer
.buf
, tree_sha1
, parents
, commit_sha1
, NULL
)) {
102 strbuf_release(&buffer
);
106 printf("%s\n", sha1_to_hex(commit_sha1
));
107 strbuf_release(&buffer
);