| commit | 9338904a5f91141ca2502abfbca87730a3aa48f0 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 28 Oct 2016 16:01:12 +0000 (28 09:01 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 28 Oct 2016 16:01:12 +0000 (28 09:01 -0700) | ||
| tree | 37e818f3bbfed8623e5c8ab320b389c4217c5d38 | treesnapshot (tar.gz zip) |
| parent | 68eb7b1b5222d5c9db2a9d5047bffe3fb65280f8 | commitdiff |
| parent | 06b3d386e0a5841c11b6730f95c44068790d791e | commitdiff |
Merge branch 'jt/fetch-pack-in-vain-count-with-stateless' into maint
When "git fetch" tries to find where the history of the repository
it runs in has diverged from what the other side has, it has a
mechanism to avoid digging too deep into irrelevant side branches.
This however did not work well over the "smart-http" transport due
to a design bug, which has been fixed.
* jt/fetch-pack-in-vain-count-with-stateless:
fetch-pack: do not reset in_vain on non-novel acks
When "git fetch" tries to find where the history of the repository
it runs in has diverged from what the other side has, it has a
mechanism to avoid digging too deep into irrelevant side branches.
This however did not work well over the "smart-http" transport due
to a design bug, which has been fixed.
* jt/fetch-pack-in-vain-count-with-stateless:
fetch-pack: do not reset in_vain on non-novel acks