Andrew's git - gitweb.git/blob

1646d5b25e4fe66cdb84a09aba87cb2f09f8c572
   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#include "gpg-interface.h"
  12
  13static const char commit_tree_usage[] = "git commit-tree [(-p <sha1>)...] [-S[<keyid>]] [-m <message>] [-F <file>] <sha1> <changelog";
  14
  15static const char *sign_commit;
  16
  17static void new_parent(struct commit *parent, struct commit_list **parents_p)
  18{
  19        unsigned char *sha1 = parent->object.sha1;
  20        struct commit_list *parents;
  21        for (parents = *parents_p; parents; parents = parents->next) {
  22                if (parents->item == parent) {
  23                        error("duplicate parent %s ignored", sha1_to_hex(sha1));
  24                        return;
  25                }
  26                parents_p = &parents->next;
  27        }
  28        commit_list_insert(parent, parents_p);
  29}
  30
  31static int commit_tree_config(const char *var, const char *value, void *cb)
  32{
  33        int status = git_gpg_config(var, value, NULL);
  34        if (status)
  35                return status;
  36        if (!strcmp(var, "commit.gpgsign")) {
  37                sign_commit = git_config_bool(var, value) ? "" : NULL;
  38                return 0;
  39        }
  40        return git_default_config(var, value, cb);
  41}
  42
  43int cmd_commit_tree(int argc, const char **argv, const char *prefix)
  44{
  45        int i, got_tree = 0;
  46        struct commit_list *parents = NULL;
  47        unsigned char tree_sha1[20];
  48        unsigned char commit_sha1[20];
  49        struct strbuf buffer = STRBUF_INIT;
  50
  51        git_config(commit_tree_config, NULL);
  52
  53        if (argc < 2 || !strcmp(argv[1], "-h"))
  54                usage(commit_tree_usage);
  55
  56        for (i = 1; i < argc; i++) {
  57                const char *arg = argv[i];
  58                if (!strcmp(arg, "-p")) {
  59                        unsigned char sha1[20];
  60                        if (argc <= ++i)
  61                                usage(commit_tree_usage);
  62                        if (get_sha1_commit(argv[i], sha1))
  63                                die("Not a valid object name %s", argv[i]);
  64                        assert_sha1_type(sha1, OBJ_COMMIT);
  65                        new_parent(lookup_commit(sha1), &parents);
  66                        continue;
  67                }
  68
  69                if (!memcmp(arg, "-S", 2)) {
  70                        sign_commit = arg + 2;
  71                        continue;
  72                }
  73
  74                if (!strcmp(arg, "-m")) {
  75                        if (argc <= ++i)
  76                                usage(commit_tree_usage);
  77                        if (buffer.len)
  78                                strbuf_addch(&buffer, '\n');
  79                        strbuf_addstr(&buffer, argv[i]);
  80                        strbuf_complete_line(&buffer);
  81                        continue;
  82                }
  83
  84                if (!strcmp(arg, "-F")) {
  85                        int fd;
  86
  87                        if (argc <= ++i)
  88                                usage(commit_tree_usage);
  89                        if (buffer.len)
  90                                strbuf_addch(&buffer, '\n');
  91                        if (!strcmp(argv[i], "-"))
  92                                fd = 0;
  93                        else {
  94                                fd = open(argv[i], O_RDONLY);
  95                                if (fd < 0)
  96                                        die_errno("git commit-tree: failed to open '%s'",
  97                                                  argv[i]);
  98                        }
  99                        if (strbuf_read(&buffer, fd, 0) < 0)
 100                                die_errno("git commit-tree: failed to read '%s'",
 101                                          argv[i]);
 102                        if (fd && close(fd))
 103                                die_errno("git commit-tree: failed to close '%s'",
 104                                          argv[i]);
 105                        strbuf_complete_line(&buffer);
 106                        continue;
 107                }
 108
 109                if (get_sha1_tree(arg, tree_sha1))
 110                        die("Not a valid object name %s", arg);
 111                if (got_tree)
 112                        die("Cannot give more than one trees");
 113                got_tree = 1;
 114        }
 115
 116        if (!buffer.len) {
 117                if (strbuf_read(&buffer, 0, 0) < 0)
 118                        die_errno("git commit-tree: failed to read");
 119        }
 120
 121        if (commit_tree(&buffer, tree_sha1, parents, commit_sha1,
 122                        NULL, sign_commit)) {
 123                strbuf_release(&buffer);
 124                return 1;
 125        }
 126
 127        printf("%s\n", sha1_to_hex(commit_sha1));
 128        strbuf_release(&buffer);
 129        return 0;
 130}