diff options
| author | Jeff King <peff@peff.net> | 2017-02-08 15:53:16 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-08 15:39:55 -0800 |
| commit | 8b24b9e76534b6664d4ea1afa67db0fbb495c925 (patch) | |
| tree | 236ee68c54bb70e4498b1eea1c050c03516ddd73 | |
| parent | fea6c47f2f106c3617eaf52f973a1a07629ebf46 (diff) | |
| download | git-8b24b9e76534b6664d4ea1afa67db0fbb495c925.tar.gz | |
receive-pack: treat namespace .have lines like alternates
Namely, de-duplicate them. We use the same set as the
alternates, since we call them both ".have" (i.e., there is
no value in showing one versus the other).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/receive-pack.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 1821ad5fa6..c23b0cce86 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -251,8 +251,9 @@ static void show_ref(const char *path, const unsigned char *sha1) } static int show_ref_cb(const char *path_full, const struct object_id *oid, - int flag, void *unused) + int flag, void *data) { + struct oidset *seen = data; const char *path = strip_namespace(path_full); if (ref_is_hidden(path, path_full)) @@ -263,8 +264,11 @@ static int show_ref_cb(const char *path_full, const struct object_id *oid, * refs, so that the client can use them to minimize data * transfer but will otherwise ignore them. */ - if (!path) + if (!path) { + if (oidset_insert(seen, oid)) + return 0; path = ".have"; + } show_ref(path, oid->hash); return 0; } @@ -287,7 +291,7 @@ static void write_head_info(void) for_each_alternate_ref(show_one_alternate_ref, &seen); oidset_clear(&seen); - for_each_ref(show_ref_cb, NULL); + for_each_ref(show_ref_cb, &seen); if (!sent_capabilities) show_ref("capabilities^{}", null_sha1); |