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 /unpack-file.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 'unpack-file.c')
| -rw-r--r-- | unpack-file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/unpack-file.c b/unpack-file.c index 3accb974dd..23a8562301 100644 --- a/unpack-file.c +++ b/unpack-file.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "blob.h" static char *create_temp_file(unsigned char *sha1) { @@ -9,7 +10,7 @@ static char *create_temp_file(unsigned char *sha1) int fd; buf = read_sha1_file(sha1, type, &size); - if (!buf || strcmp(type, "blob")) + if (!buf || strcmp(type, blob_type)) die("unable to read blob object %s", sha1_to_hex(sha1)); strcpy(path, ".merge_file_XXXXXX"); |