diff options
| author | Jeff King <peff@peff.net> | 2012-10-25 06:42:27 -0400 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-10-25 06:42:27 -0400 |
| commit | 315ea32f1bd57b884f654f6f8a965af9b5e4d8ee (patch) | |
| tree | 757e5c6df4daf22d2864bdf9c20b896d08b285f0 /builtin/describe.c | |
| parent | 6a83a6d57a61e7c9ebfb6741965f7c0bad03899e (diff) | |
| parent | 435c83323713066723e4194cd89c31bbec7011a2 (diff) | |
| download | git-315ea32f1bd57b884f654f6f8a965af9b5e4d8ee.tar.gz git-315ea32f1bd57b884f654f6f8a965af9b5e4d8ee.tar.xz | |
Merge branch 'jk/peel-ref'
Speeds up "git upload-pack" (what is invoked by "git fetch" on the
other side of the connection) by reducing the cost to advertise the
branches and tags that are available in the repository.
* jk/peel-ref:
upload-pack: use peel_ref for ref advertisements
peel_ref: check object type before loading
peel_ref: do not return a null sha1
peel_ref: use faster deref_tag_noverify
Diffstat (limited to 'builtin/describe.c')
| -rw-r--r-- | builtin/describe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/describe.c b/builtin/describe.c index 9fe11ed9d..04c185b1f 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -144,7 +144,7 @@ static int get_name(const char *path, const unsigned char *sha1, int flag, void if (!all && !might_be_tag) return 0; - if (!peel_ref(path, peeled) && !is_null_sha1(peeled)) { + if (!peel_ref(path, peeled)) { is_tag = !!hashcmp(sha1, peeled); } else { hashcpy(peeled, sha1); |