Andrew's git - gitweb.git/blob

92cfbafe363cc20063c278488e4872a6bc4fa445
   1/*
   2 * GIT - The information manager from hell
   3 *
   4 * Copyright (C) Linus Torvalds, 2005
   5 */
   6#include "cache.h"
   7#include "commit.h"
   8#include "tree.h"
   9#include "builtin.h"
  10#include "utf8.h"
  11
  12static const char commit_tree_usage[] = "git commit-tree <sha1> [(-p <sha1>)...] < changelog";
  13
  14static void new_parent(struct commit *parent, struct commit_list **parents_p)
  15{
  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));
  21                        return;
  22                }
  23                parents_p = &parents->next;
  24        }
  25        commit_list_insert(parent, parents_p);
  26}
  27
  28int cmd_commit_tree(int argc, const char **argv, const char *prefix)
  29{
  30        int i, got_tree = 0;
  31        struct commit_list *parents = NULL;
  32        unsigned char tree_sha1[20];
  33        unsigned char commit_sha1[20];
  34        struct strbuf buffer = STRBUF_INIT;
  35
  36        git_config(git_default_config, NULL);
  37
  38        if (argc < 2 || !strcmp(argv[1], "-h"))
  39                usage(commit_tree_usage);
  40
  41        for (i = 1; i < argc; i++) {
  42                const char *arg = argv[i];
  43                if (!strcmp(arg, "-p")) {
  44                        unsigned char sha1[20];
  45                        if (argc <= ++i)
  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);
  51                        continue;
  52                }
  53
  54                if (get_sha1(arg, tree_sha1))
  55                        die("Not a valid object name %s", arg);
  56                if (got_tree)
  57                        die("Cannot give more than one trees");
  58                got_tree = 1;
  59        }
  60
  61        if (strbuf_read(&buffer, 0, 0) < 0)
  62                die_errno("git commit-tree: failed to read");
  63
  64        if (commit_tree(buffer.buf, tree_sha1, parents, commit_sha1, NULL)) {
  65                strbuf_release(&buffer);
  66                return 1;
  67        }
  68
  69        printf("%s\n", sha1_to_hex(commit_sha1));
  70        strbuf_release(&buffer);
  71        return 0;
  72}