Re: [PATCH] remote: Ignore failure to remove missing branch..merge

2017-02-21 Thread Junio C Hamano
ere is what I tentatively queued. Thanks. -- >8 -- From: Ross Lagerwall Date: Sat, 18 Feb 2017 00:23:41 + Subject: [PATCH] remote: ignore failure to remove missing branch..merge It is not all too unusual for a branch to use "branch..remote" without "branch..merge". You m

Re: [PATCH] remote: Ignore failure to remove missing branch..merge

2017-02-21 Thread Ross Lagerwall
On Tue, Feb 21, 2017 at 11:32:54AM -0800, Junio C Hamano wrote: > Ross Lagerwall writes: > > > If a branch is configured with a default remote but no > > branch..merge and then the remote is removed, git fails to remove > > the remote with: > > "fatal: could not unset 'branch..merge'" > > > > Ins

Re: [PATCH] remote: Ignore failure to remove missing branch..merge

2017-02-21 Thread Junio C Hamano
Ross Lagerwall writes: > If a branch is configured with a default remote but no > branch..merge and then the remote is removed, git fails to remove > the remote with: > "fatal: could not unset 'branch..merge'" > > Instead, ignore this since it is not an error and shouldn't prevent the > remote fr

[PATCH] remote: Ignore failure to remove missing branch..merge

2017-02-17 Thread Ross Lagerwall
If a branch is configured with a default remote but no branch..merge and then the remote is removed, git fails to remove the remote with: "fatal: could not unset 'branch..merge'" Instead, ignore this since it is not an error and shouldn't prevent the remote from being removed. Signed-off-by: Ross