From 8e4402592574d630cdb5ab4f55a1b7131802ff72 Mon Sep 17 00:00:00 2001 From: Peter Eriksen Date: Sun, 2 Apr 2006 14:44:09 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- apply.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'apply.c') diff --git a/apply.c b/apply.c index c50b3a6046..cc3f12e555 100644 --- a/apply.c +++ b/apply.c @@ -9,6 +9,7 @@ #include #include "cache.h" #include "quote.h" +#include "blob.h" // --check turns on checking that the working tree matches the // files that are being modified, but doesn't apply the patch @@ -1296,7 +1297,7 @@ static int apply_fragments(struct buffer_desc *desc, struct patch *patch) * applies to. */ write_sha1_file_prepare(desc->buffer, desc->size, - "blob", sha1, hdr, &hdrlen); + blob_type, sha1, hdr, &hdrlen); if (strcmp(sha1_to_hex(sha1), patch->old_sha1_prefix)) return error("the patch applies to '%s' (%s), " "which does not match the " @@ -1659,7 +1660,7 @@ static void add_index_file(const char *path, unsigned mode, void *buf, unsigned if (lstat(path, &st) < 0) die("unable to stat newly created file %s", path); fill_stat_cache_info(ce, &st); - if (write_sha1_file(buf, size, "blob", ce->sha1) < 0) + if (write_sha1_file(buf, size, blob_type, ce->sha1) < 0) die("unable to create backing store for newly created file %s", path); if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0) die("unable to add cache entry for %s", path); -- cgit v1.2.3