summaryrefslogtreecommitdiff
path: root/combine-diff.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 /combine-diff.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 'combine-diff.c')
-rw-r--r--combine-diff.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c
index f17aab3..7693884 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1,5 +1,6 @@
#include "cache.h"
#include "commit.h"
+#include "blob.h"
#include "diff.h"
#include "diffcore.h"
#include "quote.h"
@@ -104,7 +105,7 @@ static char *grab_blob(const unsigned char *sha1, unsigned long *size)
return xcalloc(1, 1);
}
blob = read_sha1_file(sha1, type, size);
- if (strcmp(type, "blob"))
+ if (strcmp(type, blob_type))
die("object '%s' is not a blob!", sha1_to_hex(sha1));
return blob;
}