Re: [PATCH 2/2] merge-base: "--reflog" mode finds fork point from reflog entries

2013-10-24 Thread Junio C Hamano
Eric Sunshine writes: > On Thu, Oct 24, 2013 at 5:26 PM, Junio C Hamano wrote: >> Eric Sunshine writes: >> >>> On Thu, Oct 24, 2013 at 3:11 PM, Junio C Hamano wrote: diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh index f80bba8..3a1abee 100755 --- a/t/t6010-merge-base

Re: [PATCH 2/2] merge-base: "--reflog" mode finds fork point from reflog entries

2013-10-24 Thread Eric Sunshine
On Thu, Oct 24, 2013 at 5:26 PM, Junio C Hamano wrote: > Eric Sunshine writes: > >> On Thu, Oct 24, 2013 at 3:11 PM, Junio C Hamano wrote: >>> diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh >>> index f80bba8..3a1abee 100755 >>> --- a/t/t6010-merge-base.sh >>> +++ b/t/t6010-merge-base

Re: [PATCH 2/2] merge-base: "--reflog" mode finds fork point from reflog entries

2013-10-24 Thread Junio C Hamano
Eric Sunshine writes: > On Thu, Oct 24, 2013 at 3:11 PM, Junio C Hamano wrote: >> diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh >> index f80bba8..3a1abee 100755 >> --- a/t/t6010-merge-base.sh >> +++ b/t/t6010-merge-base.sh >> @@ -230,4 +230,31 @@ test_expect_success 'criss-cross mer

Re: [PATCH 2/2] merge-base: "--reflog" mode finds fork point from reflog entries

2013-10-24 Thread Eric Sunshine
On Thu, Oct 24, 2013 at 3:11 PM, Junio C Hamano wrote: > diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh > index f80bba8..3a1abee 100755 > --- a/t/t6010-merge-base.sh > +++ b/t/t6010-merge-base.sh > @@ -230,4 +230,31 @@ test_expect_success 'criss-cross merge-base for > octopus-step' '

[PATCH 2/2] merge-base: "--reflog" mode finds fork point from reflog entries

2013-10-24 Thread Junio C Hamano
The "git pull --rebase" command computes the fork point of the branch being rebased using the reflog entries of the "base" branch (typically a remote-tracking branch) the branch's work was based on, in order to cope with the case in which the "base" branch has been rewound and rebuilt. For example