diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-04 00:23:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-04 00:23:36 -0700 |
| commit | 00cbdec981e186264dc2529edce31da4bcbd41f3 (patch) | |
| tree | d1c0436f5087526442b6e35e619daf33c4ccde97 /hash-object.c | |
| parent | b411fda15df4897a1308bbb5950088ea6138cbad (diff) | |
| parent | 90321c106ca6e36c0e884ca677c9a52dea47bdde (diff) | |
| download | git-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 'hash-object.c')
| -rw-r--r-- | hash-object.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hash-object.c b/hash-object.c index 6502b5b3d1..43bd93bffb 100644 --- a/hash-object.c +++ b/hash-object.c @@ -2,9 +2,10 @@ * GIT - The information manager from hell * * Copyright (C) Linus Torvalds, 2005 - * Copyright (C) Junio C Hamano, 2005 + * Copyright (C) Junio C Hamano, 2005 */ #include "cache.h" +#include "blob.h" static void hash_object(const char *path, const char *type, int write_object) { @@ -35,7 +36,7 @@ static const char hash_object_usage[] = int main(int argc, char **argv) { int i; - const char *type = "blob"; + const char *type = blob_type; int write_object = 0; const char *prefix = NULL; int prefix_length = -1; |