summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-14 22:39:19 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-14 22:39:19 (GMT)
commit5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20 (patch)
treefc993f674db014236b94f3c6e147b1ac5b838699 /upload-pack.c
parent1733832d8ec11655924af58efb67ff4503928b59 (diff)
parente5a78b1ca8b62aee8567d67f0e0db5ac7706806a (diff)
downloadgit-5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20.zip
git-5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20.tar.gz
git-5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20.tar.bz2
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 'upload-pack.c')
-rw-r--r--upload-pack.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/upload-pack.c b/upload-pack.c
index 94aa0da..f6f5a7e 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -330,7 +330,7 @@ static int got_sha1(char *hex, unsigned char *sha1)
o = parse_object(sha1);
if (!o)
die("oops (%s)", sha1_to_hex(sha1));
- if (o->type == TYPE_COMMIT) {
+ if (o->type == OBJ_COMMIT) {
struct commit_list *parents;
if (o->flags & THEY_HAVE)
return 0;
@@ -461,7 +461,7 @@ static int send_ref(const char *refname, const unsigned char *sha1)
o->flags |= OUR_REF;
nr_our_refs++;
}
- if (o->type == TYPE_TAG) {
+ if (o->type == OBJ_TAG) {
o = deref_tag(o, refname, 0);
packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname);
}