summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorPeter Eriksen <s022018@student.dtu.dk>2006-04-02 12:44:09 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-04 07:11:19 (GMT)
commit8e4402592574d630cdb5ab4f55a1b7131802ff72 (patch)
tree5891c240ca498628ae66b8a7069ad9b90f123a2b /apply.c
parentfc9957b0052df6a8248420395bc9febd66194252 (diff)
downloadgit-8e4402592574d630cdb5ab4f55a1b7131802ff72.zip
git-8e4402592574d630cdb5ab4f55a1b7131802ff72.tar.gz
git-8e4402592574d630cdb5ab4f55a1b7131802ff72.tar.bz2
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 'apply.c')
-rw-r--r--apply.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apply.c b/apply.c
index c50b3a6..cc3f12e 100644
--- a/apply.c
+++ b/apply.c
@@ -9,6 +9,7 @@
#include <fnmatch.h>
#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);