diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-17 18:56:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-17 18:56:08 -0700 |
| commit | 8a02ad4f440da05097416e7ca719360b05d23dbf (patch) | |
| tree | c57cbc108f4e6c5c1c3338545fb9eccf3a2aad52 /upload-pack.c | |
| parent | Merge branch 'js/diff' (diff) | |
| parent | Fix git-format-patch -s (diff) | |
| download | tgif-8a02ad4f440da05097416e7ca719360b05d23dbf.tar.xz | |
Merge branch 'eb/mail' into next
* eb/mail:
Fix git-format-patch -s
Some more memory leak avoidance
Move "void *util" from "struct object" into "struct commit"
Shrink "struct object" a bit
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/upload-pack.c b/upload-pack.c index 47560c9527..979e58306e 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -105,7 +105,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 == commit_type) { + if (o->type == TYPE_COMMIT) { struct commit_list *parents; if (o->flags & THEY_HAVE) return 0; @@ -234,7 +234,7 @@ static int send_ref(const char *refname, const unsigned char *sha1) o->flags |= OUR_REF; nr_our_refs++; } - if (o->type == tag_type) { + if (o->type == TYPE_TAG) { o = deref_tag(o, refname, 0); packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname); } |