[PATCH v2] rebase: move state_dir to tmp prior to deletion

2019-01-26 Thread Ben Woosley
From: Ben Woosley To avoid partial deletion / zombie rebases. Example behavior under partial deletion, after Ctrl-Cing out of a standard rebase: $ git rebase target First, rewinding head to replay your work on top of it... Applying: [...] ^C $ git status rebase in

[PATCH] rebase: move state_dir to tmp prior to deletion

2019-01-25 Thread Ben Woosley
From: Ben Woosley To avoid partial deletion / zombie rebases. Example behavior under partial deletion, after Ctrl-Cing out of a standard rebase: $ git rebase target First, rewinding head to replay your work on top of it... Applying: [...] ^C $ git status rebase in

Re: make test Unexpected passes

2016-04-22 Thread Ben Woosley
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

2016-04-20 Thread Ben Woosley
e new branch onto the old. Best, Ben On Wed, Apr 20, 2016 at 2:13 PM, Junio C Hamano wrote: > Ben Woosley writes: > >> From: Ben Woosley >> >> Absent this fix, attempts to rebase an orphan branch with --strategy >> recursive >> will fail with: >> >

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

2016-04-20 Thread Ben Woosley
emove the soft git-lfs dependency. Best, Ben On Wed, Apr 20, 2016 at 12:36 PM, Lars Schneider wrote: > >> On Wed, Apr 20, 2016 at 12:00 PM, Luke Diamand wrote: >>> On 20 April 2016 at 19:28, Ben Woosley wrote: >>>> From: Ben Woosley >>>> >>>

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

2016-04-20 Thread Ben Woosley
tervention 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 wrote: > On 20 April 2016 at 19:28, Ben Woosley wrote: &g

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

2016-04-20 Thread Ben Woosley
From: Ben Woosley 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.2 both on linux. Mac can'

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

2016-04-20 Thread Ben Woosley
From: Ben Woosley 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 object 'ORPHAN_ROOT_SHA^' Un