2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
10 #define BLOCKING (1ul << 14)
13 * FIXME! Share the code with "write-tree.c"
15 static void init_buffer(char **bufp
, unsigned int *sizep
)
17 char *buf
= xmalloc(BLOCKING
);
22 static void add_buffer(char **bufp
, unsigned int *sizep
, const char *fmt
, ...)
27 unsigned long alloc
, size
, newsize
;
31 len
= vsnprintf(one_line
, sizeof(one_line
), fmt
, args
);
35 alloc
= (size
+ 32767) & ~32767;
37 if (newsize
> alloc
) {
38 alloc
= (newsize
+ 32767) & ~32767;
39 buf
= xrealloc(buf
, alloc
);
43 memcpy(buf
+ size
, one_line
, len
);
46 static void check_valid(unsigned char *sha1
, const char *expect
)
50 if (sha1_object_info(sha1
, type
, NULL
))
51 die("%s is not a valid object", sha1_to_hex(sha1
));
52 if (expect
&& strcmp(type
, expect
))
53 die("%s is not a valid '%s' object", sha1_to_hex(sha1
),
58 * Having more than two parents is not strange at all, and this is
59 * how multi-way merges are represented.
61 #define MAXPARENT (16)
62 static unsigned char parent_sha1
[MAXPARENT
][20];
64 static const char commit_tree_usage
[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
66 static int new_parent(int idx
)
69 unsigned char *sha1
= parent_sha1
[idx
];
70 for (i
= 0; i
< idx
; i
++) {
71 if (!memcmp(parent_sha1
[i
], sha1
, 20)) {
72 error("duplicate parent %s ignored", sha1_to_hex(sha1
));
79 int main(int argc
, char **argv
)
83 unsigned char tree_sha1
[20];
84 unsigned char commit_sha1
[20];
90 setup_git_directory();
92 git_config(git_default_config
);
95 usage(commit_tree_usage
);
96 if (get_sha1(argv
[1], tree_sha1
))
97 die("Not a valid object name %s", argv
[1]);
99 check_valid(tree_sha1
, tree_type
);
100 for (i
= 2; i
< argc
; i
+= 2) {
102 a
= argv
[i
]; b
= argv
[i
+1];
103 if (!b
|| strcmp(a
, "-p"))
104 usage(commit_tree_usage
);
105 if (get_sha1(b
, parent_sha1
[parents
]))
106 die("Not a valid object name %s", b
);
107 check_valid(parent_sha1
[parents
], commit_type
);
108 if (new_parent(parents
))
112 fprintf(stderr
, "Committing initial tree %s\n", argv
[1]);
114 init_buffer(&buffer
, &size
);
115 add_buffer(&buffer
, &size
, "tree %s\n", sha1_to_hex(tree_sha1
));
118 * NOTE! This ordering means that the same exact tree merged with a
119 * different order of parents will be a _different_ changeset even
120 * if everything else stays the same.
122 for (i
= 0; i
< parents
; i
++)
123 add_buffer(&buffer
, &size
, "parent %s\n", sha1_to_hex(parent_sha1
[i
]));
125 /* Person/date information */
126 add_buffer(&buffer
, &size
, "author %s\n", git_author_info(1));
127 add_buffer(&buffer
, &size
, "committer %s\n\n", git_committer_info(1));
129 /* And add the comment */
130 while (fgets(comment
, sizeof(comment
), stdin
) != NULL
)
131 add_buffer(&buffer
, &size
, "%s", comment
);
133 if (!write_sha1_file(buffer
, size
, commit_type
, commit_sha1
)) {
134 printf("%s\n", sha1_to_hex(commit_sha1
));