From: Jeff King <peff@peff.net>
To: Luke Diamand <luke@diamand.org>
Cc: git@vger.kernel.org, sunshine@sunshineco.com,
Junio C Hamano <gitster@pobox.com>,
egirard@murex.com, larsxschneider@gmail.com
Subject: Re: [PATCHv2] git-p4: clean up after p4 submit failure
Date: Tue, 24 Nov 2015 16:18:27 -0500 [thread overview]
Message-ID: <20151124211827.GA29185@sigill.intra.peff.net> (raw)
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 <egirard@murex.com>
>
> 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 <egirard@murex.com>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> Signed-off-by: Luke Diamand <luke@diamand.org>
> ---
Thanks, I think this should be ready for 'next', then.
-Peff
prev parent reply other threads:[~2015-11-24 21:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-24 7:43 [PATCHv2] git-p4: Handle p4 submit failure Luke Diamand
2015-11-24 7:43 ` [PATCHv2] git-p4: clean up after " Luke Diamand
2015-11-24 21:18 ` Jeff King [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151124211827.GA29185@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=egirard@murex.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=larsxschneider@gmail.com \
--cc=luke@diamand.org \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).