summaryrefslogtreecommitdiff
path: root/send-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-06 04:00:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-06 04:00:23 (GMT)
commita916cb5fb4824322d7e99b1b0efad4e6d7850e78 (patch)
treed9ccc322b7b02d3af296ef313df8dc046ca3fc7d /send-pack.c
parent3d4a3ffe64162b45ae7c991fc60623ecb4678cfd (diff)
parentd07d4ab401173a10173f2747cf5e0f074b6d2b39 (diff)
downloadgit-a916cb5fb4824322d7e99b1b0efad4e6d7850e78.zip
git-a916cb5fb4824322d7e99b1b0efad4e6d7850e78.tar.gz
git-a916cb5fb4824322d7e99b1b0efad4e6d7850e78.tar.bz2
Merge branch 'bc/object-id'
Identify parts of the code that knows that we use SHA-1 hash to name our objects too much, and use (1) symbolic constants instead of hardcoded 20 as byte count and/or (2) use struct object_id instead of unsigned char [20] for object names. * bc/object-id: apply: convert threeway_stage to object_id patch-id: convert to use struct object_id commit: convert parts to struct object_id diff: convert struct combine_diff_path to object_id bulk-checkin.c: convert to use struct object_id zip: use GIT_SHA1_HEXSZ for trailers archive.c: convert to use struct object_id bisect.c: convert leaf functions to use struct object_id define utility functions for object IDs define a structure for object IDs
Diffstat (limited to 'send-pack.c')
-rw-r--r--send-pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/send-pack.c b/send-pack.c
index 2e07ac3..2a64fec 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -182,7 +182,7 @@ static int advertise_shallow_grafts_cb(const struct commit_graft *graft, void *c
{
struct strbuf *sb = cb;
if (graft->nr_parent == -1)
- packet_buf_write(sb, "shallow %s\n", sha1_to_hex(graft->sha1));
+ packet_buf_write(sb, "shallow %s\n", oid_to_hex(&graft->oid));
return 0;
}