diff options
| author |  Peter Eriksen <s022018@student.dtu.dk> | 2006-04-02 14:44:09 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-04-04 00:11:19 -0700 |
| commit | 8e4402592574d630cdb5ab4f55a1b7131802ff72 (patch) | |
| tree | 5891c240ca498628ae66b8a7069ad9b90f123a2b /commit-tree.c | |
| parent | contrib/git-svn: handle array values correctly (diff) | |
| download | tgif-8e4402592574d630cdb5ab4f55a1b7131802ff72.tar.xz | |
Use blob_, commit_, tag_, and tree_type throughout.
This replaces occurences of "blob", "commit", "tag", and "tree",
where they're really used as type specifiers, which we already
have defined global constants for.
Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'commit-tree.c')
| -rw-r--r-- | commit-tree.c | 8 |
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; } |