2005-04-08 02:16:10 +04:00
|
|
|
/*
|
|
|
|
* GIT - The information manager from hell
|
|
|
|
*
|
|
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
|
|
*/
|
2005-04-08 02:13:13 +04:00
|
|
|
#include "cache.h"
|
2006-04-02 16:44:09 +04:00
|
|
|
#include "commit.h"
|
|
|
|
#include "tree.h"
|
2006-05-23 16:15:33 +04:00
|
|
|
#include "builtin.h"
|
2006-12-23 00:06:08 +03:00
|
|
|
#include "utf8.h"
|
2005-04-08 02:13:13 +04:00
|
|
|
|
2010-10-08 21:31:17 +04:00
|
|
|
static const char commit_tree_usage[] = "git commit-tree <sha1> [(-p <sha1>)...] < changelog";
|
2005-04-21 06:49:16 +04:00
|
|
|
|
2008-06-27 16:24:47 +04:00
|
|
|
static void new_parent(struct commit *parent, struct commit_list **parents_p)
|
2005-06-19 21:40:10 +04:00
|
|
|
{
|
2008-06-27 16:24:47 +04:00
|
|
|
unsigned char *sha1 = parent->object.sha1;
|
|
|
|
struct commit_list *parents;
|
|
|
|
for (parents = *parents_p; parents; parents = parents->next) {
|
|
|
|
if (parents->item == parent) {
|
2005-06-19 21:40:10 +04:00
|
|
|
error("duplicate parent %s ignored", sha1_to_hex(sha1));
|
2008-06-27 16:24:47 +04:00
|
|
|
return;
|
2005-06-19 21:40:10 +04:00
|
|
|
}
|
2008-06-27 16:24:47 +04:00
|
|
|
parents_p = &parents->next;
|
2005-06-19 21:40:10 +04:00
|
|
|
}
|
2008-06-27 16:24:47 +04:00
|
|
|
commit_list_insert(parent, parents_p);
|
2005-06-19 21:40:10 +04:00
|
|
|
}
|
|
|
|
|
2008-07-01 06:37:49 +04:00
|
|
|
int cmd_commit_tree(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct commit_list *parents = NULL;
|
|
|
|
unsigned char tree_sha1[20];
|
|
|
|
unsigned char commit_sha1[20];
|
|
|
|
struct strbuf buffer = STRBUF_INIT;
|
|
|
|
|
|
|
|
git_config(git_default_config, NULL);
|
|
|
|
|
2009-11-09 18:04:44 +03:00
|
|
|
if (argc < 2 || !strcmp(argv[1], "-h"))
|
2008-07-01 06:37:49 +04:00
|
|
|
usage(commit_tree_usage);
|
|
|
|
if (get_sha1(argv[1], tree_sha1))
|
|
|
|
die("Not a valid object name %s", argv[1]);
|
|
|
|
|
|
|
|
for (i = 2; i < argc; i += 2) {
|
|
|
|
unsigned char sha1[20];
|
|
|
|
const char *a, *b;
|
|
|
|
a = argv[i]; b = argv[i+1];
|
|
|
|
if (!b || strcmp(a, "-p"))
|
|
|
|
usage(commit_tree_usage);
|
|
|
|
|
|
|
|
if (get_sha1(b, sha1))
|
|
|
|
die("Not a valid object name %s", b);
|
make commit_tree a library function
Until now, this has been part of the commit-tree builtin.
However, it is already used by other builtins (like commit,
merge, and notes), and it would be useful to access it from
library code.
The check_valid helper has to come along, too, but is given
a more library-ish name of "assert_sha1_type".
Otherwise, the code is unchanged. There are still a few
rough edges for a library function, like printing the utf8
warning to stderr, but we can address those if and when they
come up as inappropriate.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-04-02 04:05:23 +04:00
|
|
|
assert_sha1_type(sha1, OBJ_COMMIT);
|
2008-07-01 06:37:49 +04:00
|
|
|
new_parent(lookup_commit(sha1), &parents);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strbuf_read(&buffer, 0, 0) < 0)
|
2009-06-27 19:58:46 +04:00
|
|
|
die_errno("git commit-tree: failed to read");
|
2008-07-01 06:37:49 +04:00
|
|
|
|
2010-10-02 12:41:00 +04:00
|
|
|
if (commit_tree(buffer.buf, tree_sha1, parents, commit_sha1, NULL)) {
|
|
|
|
strbuf_release(&buffer);
|
2006-03-25 09:23:25 +03:00
|
|
|
return 1;
|
2010-10-02 12:41:00 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
printf("%s\n", sha1_to_hex(commit_sha1));
|
|
|
|
strbuf_release(&buffer);
|
|
|
|
return 0;
|
2005-04-08 02:13:13 +04:00
|
|
|
}
|