Re: [PATCH 0/2] finding the fork point from reflog entries

2013-10-24 Thread Junio C Hamano
John Keeping writes: > To clarify: the particular commit in the calls above happens to be the > oldest entry in the reflog, if I pick a newer entry then it works. > > It seems that for_each_reflog_ent isn't returning the oldest entry; > revs.nr is 62 whereas "git rev-list -g origin/master | wc -l

Re: [PATCH 0/2] finding the fork point from reflog entries

2013-10-24 Thread John Keeping
On Thu, Oct 24, 2013 at 10:40:07PM +0100, John Keeping wrote: > On Thu, Oct 24, 2013 at 10:31:35PM +0100, John Keeping wrote: > > On Thu, Oct 24, 2013 at 02:20:29PM -0700, Junio C Hamano wrote: > > > John Keeping writes: > > > > > > > On Thu, Oct 24, 2013 at 12:11:22PM -0700, Junio C Hamano wrote

Re: [PATCH 0/2] finding the fork point from reflog entries

2013-10-24 Thread John Keeping
On Thu, Oct 24, 2013 at 10:31:35PM +0100, John Keeping wrote: > On Thu, Oct 24, 2013 at 02:20:29PM -0700, Junio C Hamano wrote: > > John Keeping writes: > > > > > On Thu, Oct 24, 2013 at 12:11:22PM -0700, Junio C Hamano wrote: > > >> The first one is a clean-up of the code to parse command line >

Re: [PATCH 0/2] finding the fork point from reflog entries

2013-10-24 Thread John Keeping
On Thu, Oct 24, 2013 at 02:20:29PM -0700, Junio C Hamano wrote: > John Keeping writes: > > > On Thu, Oct 24, 2013 at 12:11:22PM -0700, Junio C Hamano wrote: > >> The first one is a clean-up of the code to parse command line > >> options to "git merge-base". Options such as "--independent", > >>

Re: [PATCH 0/2] finding the fork point from reflog entries

2013-10-24 Thread Junio C Hamano
John Keeping writes: > On Thu, Oct 24, 2013 at 12:11:22PM -0700, Junio C Hamano wrote: >> The first one is a clean-up of the code to parse command line >> options to "git merge-base". Options such as "--independent", >> "--is-ancestor" and "--octopus" are mutually exclusive and it is >> better e

Re: [PATCH 0/2] finding the fork point from reflog entries

2013-10-24 Thread John Keeping
On Thu, Oct 24, 2013 at 12:11:22PM -0700, Junio C Hamano wrote: > The first one is a clean-up of the code to parse command line > options to "git merge-base". Options such as "--independent", > "--is-ancestor" and "--octopus" are mutually exclusive and it is > better expressed in terms of the rece

[PATCH 0/2] finding the fork point from reflog entries

2013-10-24 Thread Junio C Hamano
The first one is a clean-up of the code to parse command line options to "git merge-base". Options such as "--independent", "--is-ancestor" and "--octopus" are mutually exclusive and it is better expressed in terms of the recently introduced OPT_CMDMODE. The second one implements the entire logic