| commit | 938c2a63212847bf87fc2a7076ccd4e15dfa3955 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 29 Sep 2016 23:57:13 +0000 (29 16:57 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 29 Sep 2016 23:57:13 +0000 (29 16:57 -0700) | ||
| tree | 210b729986409032610fe25f3d30b7d03cc623ce | treesnapshot (tar.gz zip) |
| parent | 5c2c2d4aeed92ce047e889f415b513e1ee6ac3de | commitdiff |
| parent | 06b3d386e0a5841c11b6730f95c44068790d791e | commitdiff |
Merge branch 'jt/fetch-pack-in-vain-count-with-stateless'
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