diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-07-14 15:39:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-14 15:39:19 -0700 |
| commit | 5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20 (patch) | |
| tree | fc993f674db014236b94f3c6e147b1ac5b838699 /builtin-diff.c | |
| parent | Merge branch 'sp/lazy-mkdir' (diff) | |
| parent | builtin-prune.c: forgot TYPE => OBJ changes. (diff) | |
| download | tgif-5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20.tar.xz | |
Merge branch 'lt/unitype'
* lt/unitype:
builtin-prune.c: forgot TYPE => OBJ changes.
Remove TYPE_* constant macros and use object_type enums consistently.
Diffstat (limited to 'builtin-diff.c')
| -rw-r--r-- | builtin-diff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-diff.c b/builtin-diff.c index ae901dd25e..cb38f44561 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -285,9 +285,9 @@ int cmd_diff(int argc, const char **argv, char **envp) obj = deref_tag(obj, NULL, 0); if (!obj) die("invalid object '%s' given.", name); - if (obj->type == TYPE_COMMIT) + if (obj->type == OBJ_COMMIT) obj = &((struct commit *)obj)->tree->object; - if (obj->type == TYPE_TREE) { + if (obj->type == OBJ_TREE) { if (ARRAY_SIZE(ent) <= ents) die("more than %d trees given: '%s'", (int) ARRAY_SIZE(ent), name); @@ -297,7 +297,7 @@ int cmd_diff(int argc, const char **argv, char **envp) ents++; continue; } - if (obj->type == TYPE_BLOB) { + if (obj->type == OBJ_BLOB) { if (2 <= blobs) die("more than two blobs given: '%s'", name); memcpy(blob[blobs].sha1, obj->sha1, 20); |