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)) { strbuf_release(&buffer); return 1; } printf("%s\n", sha1_to_hex(commit_sha1)); strbuf_release(&buffer); return 0; }
int cmd_commit_tree(int argc, const char **argv, const char *prefix) { int i, got_tree = 0; struct commit_list *parents = NULL; unsigned char tree_sha1[20]; unsigned char commit_sha1[20]; struct strbuf buffer = STRBUF_INIT; git_config(commit_tree_config, NULL); if (argc < 2 || !strcmp(argv[1], "-h")) usage(commit_tree_usage); for (i = 1; i < argc; i++) { const char *arg = argv[i]; if (!strcmp(arg, "-p")) { unsigned char sha1[20]; if (argc <= ++i) usage(commit_tree_usage); if (get_sha1_commit(argv[i], sha1)) die("Not a valid object name %s", argv[i]); assert_sha1_type(sha1, OBJ_COMMIT); new_parent(lookup_commit(sha1), &parents); continue; } if (skip_prefix(arg, "-S", &sign_commit)) continue; if (!strcmp(arg, "--no-gpg-sign")) { sign_commit = NULL; continue; } if (!strcmp(arg, "-m")) { if (argc <= ++i) usage(commit_tree_usage); if (buffer.len) strbuf_addch(&buffer, '\n'); strbuf_addstr(&buffer, argv[i]); strbuf_complete_line(&buffer); continue; } if (!strcmp(arg, "-F")) { int fd; if (argc <= ++i) usage(commit_tree_usage); if (buffer.len) strbuf_addch(&buffer, '\n'); if (!strcmp(argv[i], "-")) fd = 0; else { fd = open(argv[i], O_RDONLY); if (fd < 0) die_errno("git commit-tree: failed to open '%s'", argv[i]); } if (strbuf_read(&buffer, fd, 0) < 0) die_errno("git commit-tree: failed to read '%s'", argv[i]); if (fd && close(fd)) die_errno("git commit-tree: failed to close '%s'", argv[i]); strbuf_complete_line(&buffer); continue; } if (get_sha1_tree(arg, tree_sha1)) die("Not a valid object name %s", arg); if (got_tree) die("Cannot give more than one trees"); got_tree = 1; } if (!buffer.len) { if (strbuf_read(&buffer, 0, 0) < 0) die_errno("git commit-tree: failed to read"); } if (commit_tree(buffer.buf, buffer.len, tree_sha1, parents, commit_sha1, NULL, sign_commit)) { strbuf_release(&buffer); return 1; } printf("%s\n", sha1_to_hex(commit_sha1)); strbuf_release(&buffer); return 0; }