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 /combine-diff.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 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index f17aab33f1..7693884fdb 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; } |