Re: [PATCH v2 2/2] rebase: omit patch-identical commits with --fork-point

2014-07-17 Thread John Keeping
On Wed, Jul 16, 2014 at 05:36:03PM -0400, Ted Felix wrote: > On 07/16/2014 03:23 PM, John Keeping wrote: > > Change from v1: > > - add a test case > > Test case is working fine for me. It passes with the patch and fails > without. However, it does seem to cause all the rest of the test cas

Re: [PATCH v2 2/2] rebase: omit patch-identical commits with --fork-point

2014-07-16 Thread Ted Felix
On 07/16/2014 03:23 PM, John Keeping wrote: Change from v1: - add a test case Test case is working fine for me. It passes with the patch and fails without. However, it does seem to cause all the rest of the test cases to fail if it fails. Is there some cleanup missing? Ted. -- To un

Re: [PATCH v2 2/2] rebase: omit patch-identical commits with --fork-point

2014-07-16 Thread Junio C Hamano
John Keeping writes: > When the `--fork-point` argument was added to `git rebase`, we changed > the value of $upstream to be the fork point instead of the point from > which we want to rebase. When $orig_head..$upstream is empty this does > not change the behaviour, but when there are new change