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 "commit.h"
   8 #include "tree.h"
   9 #include "builtin.h"
  10 #include "utf8.h"
  11
  12 #define BLOCKING (1ul << 14)
  13
  14 /*
  15  * FIXME! Share the code with "write-tree.c"
  16  */
  17 static void check_valid(unsigned char *sha1, enum object_type expect)
  18 {
  19         enum object_type type = sha1_object_info(sha1, NULL);
  20         if (type < 0)
  21                 die("%s is not a valid object", sha1_to_hex(sha1));
  22         if (type != expect)
  23                 die("%s is not a valid '%s' object", sha1_to_hex(sha1),
  24                     typename(expect));
  25 }
  26
  27 static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
  28
  29 static void new_parent(struct commit *parent, struct commit_list **parents_p)
  30 {
  31         unsigned char *sha1 = parent->object.sha1;
  32         struct commit_list *parents;
  33         for (parents = *parents_p; parents; parents = parents->next) {
  34                 if (parents->item == parent) {
  35                         error("duplicate parent %s ignored", sha1_to_hex(sha1));
  36                         return;
  37                 }
  38                 parents_p = &parents->next;
  39         }
  40         commit_list_insert(parent, parents_p);
  41 }
  42
  43 static const char commit_utf8_warn[] =
  44 "Warning: commit message does not conform to UTF-8.\n"
  45 "You may want to amend it after fixing the message, or set the config\n"
  46 "variable i18n.commitencoding to the encoding your project uses.\n";
  47
  48 int cmd_commit_tree(int argc, const char **argv, const char *prefix)
  49 {
  50         int i;
  51         struct commit_list *parents = NULL;
  52         unsigned char tree_sha1[20];
  53         unsigned char commit_sha1[20];
  54         struct strbuf buffer;
  55         int encoding_is_utf8;
  56
  57         git_config(git_default_config, NULL);
  58
  59         if (argc < 2)
  60                 usage(commit_tree_usage);
  61         if (get_sha1(argv[1], tree_sha1))
  62                 die("Not a valid object name %s", argv[1]);
  63
  64         check_valid(tree_sha1, OBJ_TREE);
  65         for (i = 2; i < argc; i += 2) {
  66                 unsigned char sha1[20];
  67                 const char *a, *b;
  68                 a = argv[i]; b = argv[i+1];
  69                 if (!b || strcmp(a, "-p"))
  70                         usage(commit_tree_usage);
  71
  72                 if (get_sha1(b, sha1))
  73                         die("Not a valid object name %s", b);
  74                 check_valid(sha1, OBJ_COMMIT);
  75                 new_parent(lookup_commit(sha1), &parents);
  76         }
  77
  78         /* Not having i18n.commitencoding is the same as having utf-8 */
  79         encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
  80
  81         strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */
  82         strbuf_addf(&buffer, "tree %s\n", sha1_to_hex(tree_sha1));
  83
  84         /*
  85          * NOTE! This ordering means that the same exact tree merged with a
  86          * different order of parents will be a _different_ changeset even
  87          * if everything else stays the same.
  88          */
  89         while (parents) {
  90                 struct commit_list *next = parents->next;
  91                 strbuf_addf(&buffer, "parent %s\n",
  92                         sha1_to_hex(parents->item->object.sha1));
  93                 free(parents);
  94                 parents = next;
  95         }
  96
  97         /* Person/date information */
  98         strbuf_addf(&buffer, "author %s\n", git_author_info(IDENT_ERROR_ON_NO_NAME));
  99         strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_ERROR_ON_NO_NAME));
 100         if (!encoding_is_utf8)
 101                 strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding);
 102         strbuf_addch(&buffer, '\n');
 103
 104         /* And add the comment */
 105         if (strbuf_read(&buffer, 0, 0) < 0)
 106                 die("git-commit-tree: read returned %s", strerror(errno));
 107
 108         /* And check the encoding */
 109         if (encoding_is_utf8 && !is_utf8(buffer.buf))
 110                 fprintf(stderr, commit_utf8_warn);
 111
 112         if (!write_sha1_file(buffer.buf, buffer.len, commit_type, commit_sha1)) {
 113                 printf("%s\n", sha1_to_hex(commit_sha1));
 114                 return 0;
 115         }
 116         else
 117                 return 1;
 118 }