builtin/commit-tree.c

   1 /*
   2  * GIT - The information manager from hell
   3  *
   4  * Copyright (C) Linus Torvalds, 2005
   5  */
   6 #include "cache.h"
   7 #include "config.h"
   8 #include "object-store.h"
   9 #include "repository.h"
  10 #include "commit.h"
  11 #include "tree.h"
  12 #include "builtin.h"
  13 #include "utf8.h"
  14 #include "gpg-interface.h"
  15 #include "parse-options.h"
  16
  17 static const char * const commit_tree_usage[] = {
  18         N_("git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n"
  19            "                [(-F <file>)...] <tree>"),
  20         NULL
  21 };
  22
  23 static const char *sign_commit;
  24
  25 static void new_parent(struct commit *parent, struct commit_list **parents_p)
  26 {
  27         struct object_id *oid = &parent->object.oid;
  28         struct commit_list *parents;
  29         for (parents = *parents_p; parents; parents = parents->next) {
  30                 if (parents->item == parent) {
  31                         error(_("duplicate parent %s ignored"), oid_to_hex(oid));
  32                         return;
  33                 }
  34                 parents_p = &parents->next;
  35         }
  36         commit_list_insert(parent, parents_p);
  37 }
  38
  39 static int commit_tree_config(const char *var, const char *value, void *cb)
  40 {
  41         int status = git_gpg_config(var, value, NULL);
  42         if (status)
  43                 return status;
  44         return git_default_config(var, value, cb);
  45 }
  46
  47 static int parse_parent_arg_callback(const struct option *opt,
  48                 const char *arg, int unset)
  49 {
  50         struct object_id oid;
  51         struct commit_list **parents = opt->value;
  52
  53         BUG_ON_OPT_NEG_NOARG(unset, arg);
  54
  55         if (get_oid_commit(arg, &oid))
  56                 die(_("not a valid object name %s"), arg);
  57
  58         assert_oid_type(&oid, OBJ_COMMIT);
  59         new_parent(lookup_commit(the_repository, &oid), parents);
  60         return 0;
  61 }
  62
  63 static int parse_message_arg_callback(const struct option *opt,
  64                 const char *arg, int unset)
  65 {
  66         struct strbuf *buf = opt->value;
  67
  68         BUG_ON_OPT_NEG_NOARG(unset, arg);
  69
  70         if (buf->len)
  71                 strbuf_addch(buf, '\n');
  72         strbuf_addstr(buf, arg);
  73         strbuf_complete_line(buf);
  74
  75         return 0;
  76 }
  77
  78 static int parse_file_arg_callback(const struct option *opt,
  79                 const char *arg, int unset)
  80 {
  81         int fd;
  82         struct strbuf *buf = opt->value;
  83
  84         BUG_ON_OPT_NEG_NOARG(unset, arg);
  85
  86         if (buf->len)
  87                 strbuf_addch(buf, '\n');
  88         if (!strcmp(arg, "-"))
  89                 fd = 0;
  90         else {
  91                 fd = xopen(arg, O_RDONLY);
  92         }
  93         if (strbuf_read(buf, fd, 0) < 0)
  94                 die_errno(_("git commit-tree: failed to read '%s'"), arg);
  95         if (fd && close(fd))
  96                 die_errno(_("git commit-tree: failed to close '%s'"), arg);
  97
  98         return 0;
  99 }
 100
 101 int cmd_commit_tree(int argc, const char **argv, const char *prefix)
 102 {
 103         static struct strbuf buffer = STRBUF_INIT;
 104         struct commit_list *parents = NULL;
 105         struct object_id tree_oid;
 106         struct object_id commit_oid;
 107
 108         struct option options[] = {
 109                 OPT_CALLBACK_F('p', NULL, &parents, N_("parent"),
 110                         N_("id of a parent commit object"), PARSE_OPT_NONEG,
 111                         parse_parent_arg_callback),
 112                 OPT_CALLBACK_F('m', NULL, &buffer, N_("message"),
 113                         N_("commit message"), PARSE_OPT_NONEG,
 114                         parse_message_arg_callback),
 115                 OPT_CALLBACK_F('F', NULL, &buffer, N_("file"),
 116                         N_("read commit log message from file"), PARSE_OPT_NONEG,
 117                         parse_file_arg_callback),
 118                 { OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
 119                         N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
 120                 OPT_END()
 121         };
 122
 123         git_config(commit_tree_config, NULL);
 124
 125         if (argc < 2 || !strcmp(argv[1], "-h"))
 126                 usage_with_options(commit_tree_usage, options);
 127
 128         argc = parse_options(argc, argv, prefix, options, commit_tree_usage, 0);
 129
 130         if (argc != 1)
 131                 die(_("must give exactly one tree"));
 132
 133         if (get_oid_tree(argv[0], &tree_oid))
 134                 die(_("not a valid object name %s"), argv[0]);
 135
 136         if (!buffer.len) {
 137                 if (strbuf_read(&buffer, 0, 0) < 0)
 138                         die_errno(_("git commit-tree: failed to read"));
 139         }
 140
 141         if (commit_tree(buffer.buf, buffer.len, &tree_oid, parents, &commit_oid,
 142                         NULL, sign_commit)) {
 143                 strbuf_release(&buffer);
 144                 return 1;
 145         }
 146
 147         printf("%s\n", oid_to_hex(&commit_oid));
 148         strbuf_release(&buffer);
 149         return 0;
 150 }