From: Jeff King Date: Tue, 24 Nov 2015 21:18:27 GMT Subject: Re: [PATCHv2] git-p4: clean up after p4 submit failure Message-ID: <20151124211827.GA29185@sigill.intra.peff.net> In-Reply-To: <1448351039-15625-2-git-send-email-luke@diamand.org> On Tue, Nov 24, 2015 at 07:43:59AM +0000, Luke Diamand wrote: > From: GIRARD Etienne > > When "p4 submit" command fails in P4Submit.applyCommit, the > workspace is left with the changes. We already have code to revert > the changes to the workspace when the user decides to cancel > submission by aborting the editor that edits the change description, > and we should treat the "p4 submit" failure the same way. > > Clean the workspace if p4_write_pipe raised SystemExit, so that the > user don't have to do it themselves. > > Signed-off-by: GIRARD Etienne > Signed-off-by: Junio C Hamano > Signed-off-by: Luke Diamand > --- Thanks, I think this should be ready for 'next', then. -Peff