# ignite-456: git abort
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/629fdf3d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/629fdf3d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/629fdf3d Branch: refs/heads/ignite-456 Commit: 629fdf3d0db5ef4731814188c65f6bfd22aedea1 Parents: 78885f3 Author: Artem Shutak <ashu...@gridgain.com> Authored: Mon May 18 15:45:15 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Mon May 18 15:45:15 2015 +0300 ---------------------------------------------------------------------- dev-tools/src/main/groovy/jiraslurp.groovy | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/629fdf3d/dev-tools/src/main/groovy/jiraslurp.groovy ---------------------------------------------------------------------- diff --git a/dev-tools/src/main/groovy/jiraslurp.groovy b/dev-tools/src/main/groovy/jiraslurp.groovy index dee75ad..6d287bf 100644 --- a/dev-tools/src/main/groovy/jiraslurp.groovy +++ b/dev-tools/src/main/groovy/jiraslurp.groovy @@ -133,7 +133,14 @@ def applyPatch = { jira, attachementURL -> patchFile << new URL("$ATTACHMENT_URL/$attachementURL/").text - checkprocess "git am ../${patchFile.name}".execute(null, new File('incubator-ignite')) + try { + checkprocess "git am ../${patchFile.name}".execute(null, new File('incubator-ignite')) + } + catch (Exception e) { + checkprocess "git am --abort".execute + + throw e; + } assert patchFile.delete(), 'Could not delete patch file.' }
