Re: make test Unexpected passes

Ramsay Jones ramsayjones.plus.com> writes: > > Hi Ben, Junio, > > Tonight, the testsuite passed with a couple of 'unexpected passes', viz: > > In the first case, t3421-*.sh, git bisect fingered commit f32ec670 > ("git-rebase--merge: don't include absent parent as a base", 20-04-2016). > > ATB,

Re: [PATCH] git-rebase--merge: don't include absent parent as a base

branch onto the old. Best, Ben On Wed, Apr 20, 2016 at 2:13 PM, Junio C Hamano <gits...@pobox.com> wrote: > Ben Woosley <ben.woos...@gmail.com> writes: > >> From: Ben Woosley <ben.woos...@gmail.com> >> >> Absent this fix, attempts to rebase an o

Re: [PATCH] Update git-p4 to be compatible with git-lfs 1.2

the soft git-lfs dependency. Best, Ben On Wed, Apr 20, 2016 at 12:36 PM, Lars Schneider <larsxschnei...@gmail.com> wrote: > >> On Wed, Apr 20, 2016 at 12:00 PM, Luke Diamand <l...@diamand.org> wrote: >>> On 20 April 2016 at 19:28, Ben Woosley <ben.woos...@gmail.c

Re: [PATCH] Update git-p4 to be compatible with git-lfs 1.2

into the existing behavior Lars how about adding my Travis changes to your patch? Here's a look at the CI output: https://travis-ci.org/git/git/builds/124105972 Best, Ben On Wed, Apr 20, 2016 at 12:00 PM, Luke Diamand <l...@diamand.org> wrote: > On 20 April 2016 at 19:28, Ben Woosley

[PATCH] Update git-p4 to be compatible with git-lfs 1.2

From: Ben Woosley <ben.woos...@gmail.com> The git lfs pointer output was changed in: https://github.com/github/git-lfs/pull/1105 This was causing Mac Travis runs to fail, as homebrew had updated to 1.2 while Linux was pinned at 1.1 via GIT_LFS_VERSION. The travis builds against 1.1 and 1.

[PATCH] git-rebase--merge: don't include absent parent as a base

From: Ben Woosley <ben.woos...@gmail.com> Absent this fix, attempts to rebase an orphan branch with --strategy recursive will fail with: $ git rebase ORPHAN_TARGET_BASE -s recursive First, rewinding head to replay your work on top of it... fatal: Could not parse