summaryrefslogtreecommitdiff
path: root/commit-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-04 00:23:36 -0700
committerJunio C Hamano <junkio@cox.net>2006-04-04 00:23:36 -0700
commit00cbdec981e186264dc2529edce31da4bcbd41f3 (patch)
treed1c0436f5087526442b6e35e619daf33c4ccde97 /commit-tree.c
parentb411fda15df4897a1308bbb5950088ea6138cbad (diff)
parent90321c106ca6e36c0e884ca677c9a52dea47bdde (diff)
downloadgit-00cbdec981e186264dc2529edce31da4bcbd41f3.tar.gz
Merge branch 'pe/cleanup' into next
* pe/cleanup: Replace xmalloc+memset(0) with xcalloc. Use blob_, commit_, tag_, and tree_type throughout.
Diffstat (limited to 'commit-tree.c')
-rw-r--r--commit-tree.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/commit-tree.c b/commit-tree.c
index 16c1787133..2d8651894a 100644
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -4,6 +4,8 @@
* Copyright (C) Linus Torvalds, 2005
*/
#include "cache.h"
+#include "commit.h"
+#include "tree.h"
#define BLOCKING (1ul << 14)
@@ -93,13 +95,13 @@ int main(int argc, char **argv)
if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
usage(commit_tree_usage);
- check_valid(tree_sha1, "tree");
+ check_valid(tree_sha1, tree_type);
for (i = 2; i < argc; i += 2) {
char *a, *b;
a = argv[i]; b = argv[i+1];
if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
usage(commit_tree_usage);
- check_valid(parent_sha1[parents], "commit");
+ check_valid(parent_sha1[parents], commit_type);
if (new_parent(parents))
parents++;
}
@@ -125,7 +127,7 @@ int main(int argc, char **argv)
while (fgets(comment, sizeof(comment), stdin) != NULL)
add_buffer(&buffer, &size, "%s", comment);
- if (!write_sha1_file(buffer, size, "commit", commit_sha1)) {
+ if (!write_sha1_file(buffer, size, commit_type, commit_sha1)) {
printf("%s\n", sha1_to_hex(commit_sha1));
return 0;
}