diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-04 13:43:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-04 13:43:00 -0700 |
| commit | 810e1523753553968aac827f57e0e24fc9af6546 (patch) | |
| tree | 47ec02a8c4a16c1f04e79e10a9b47cbcdfe4f564 /unpack-file.c | |
| parent | Merge branch 'lt/fix-sol-pack' (diff) | |
| parent | Replace xmalloc+memset(0) with xcalloc. (diff) | |
| download | tgif-810e1523753553968aac827f57e0e24fc9af6546.tar.xz | |
Merge branch 'pe/cleanup'
* 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"); |