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 2/2] rebase: omit patch-identical commits with --fork-point

2014-07-15 Thread Ted Felix
Thanks, John. My test script is working fine for me now with these patches. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[BUG] rebase no longer omits local commits

2014-07-03 Thread Ted Felix
Starting with git 1.9.0, rebase no longer omits local commits that appear in both the upstream and local branches. I've bisected this down to commit bb3f458: "rebase: fix fork-point with zero arguments". The attached script reproduces the problem. Reverting the aforementioned commit fixes th