mirror of
https://github.com/git/git.git
synced 2024-11-05 08:47:56 +01:00
40d52ff77b
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>
65 lines
1.6 KiB
C
65 lines
1.6 KiB
C
/*
|
|
* GIT - The information manager from hell
|
|
*
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
*/
|
|
#include "cache.h"
|
|
#include "commit.h"
|
|
#include "tree.h"
|
|
#include "builtin.h"
|
|
#include "utf8.h"
|
|
|
|
static const char commit_tree_usage[] = "git commit-tree <sha1> [-p <sha1>]* < changelog";
|
|
|
|
static void new_parent(struct commit *parent, struct commit_list **parents_p)
|
|
{
|
|
unsigned char *sha1 = parent->object.sha1;
|
|
struct commit_list *parents;
|
|
for (parents = *parents_p; parents; parents = parents->next) {
|
|
if (parents->item == parent) {
|
|
error("duplicate parent %s ignored", sha1_to_hex(sha1));
|
|
return;
|
|
}
|
|
parents_p = &parents->next;
|
|
}
|
|
commit_list_insert(parent, parents_p);
|
|
}
|
|
|
|
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);
|
|
|
|
if (argc < 2 || !strcmp(argv[1], "-h"))
|
|
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);
|
|
assert_sha1_type(sha1, OBJ_COMMIT);
|
|
new_parent(lookup_commit(sha1), &parents);
|
|
}
|
|
|
|
if (strbuf_read(&buffer, 0, 0) < 0)
|
|
die_errno("git commit-tree: failed to read");
|
|
|
|
if (!commit_tree(buffer.buf, tree_sha1, parents, commit_sha1, NULL)) {
|
|
printf("%s\n", sha1_to_hex(commit_sha1));
|
|
return 0;
|
|
}
|
|
else
|
|
return 1;
|
|
}
|