Re: [PATCH v4 04/10] commit-graph: return 64-bit generation number
- From
Abhishek Kumar <abhishekkumar8222@gmail.com>
- Date
- Nov 3, 2020, 06:40 UTC
- Message-ID
- <20201103064058.GB13228@Abhishek-Arch>
- In-Reply-To
- <85imay2z84.fsf@gmail.com>
On Sun, Oct 25, 2020 at 02:48:27PM +0100, Jakub Narębski wrote:
Show 11 quoted lines
> Hi Abhishek, > > Note that there are two changes that are not mentioned in the commit > message, namely adding 'const'-ness to generation_a/b local variables in > commit_gen_cmp() from commit-graph.c, and switching from > GENERATION_NUMBER_ZERO to GENERATION_NUMBER_INFINITY as the default > (initial) value for 'max_generation' in repo_in_merge_bases_many(). > > While the former is a simple "while-at-it" change that shouldn't affect > correctness, the latter needs an explanation (or fixing if it is wrong). >
The change from GENERATION_NUMBER_ZERO to GENERATION_NUMBER_INFINITY was incorrect. While fixing merge conflicts on rebasing to master again, I didn't notice that repo_in_merge_bases_many() switched from using min_generation and GENERATION_NUMBER_ZERO to max_generation and GENERATION_NUMBER_ZERO.
Thanks for noticing!
Show 5 quoted lines
> ... > > Best, > -- > Jakub Narębski