From: Sverre Rabbelier <srabbelier@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>, "Jeff King" <peff@peff.net>,
Git List <git@vger.kernel.org>,
Daniel Barkalow <barkalow@iabervon.org>,
Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Sverre Rabbelier <srabbelier@gmail.com>
Subject: [PATCH 13/19] transport-helper: check status code of finish_command
Date: Wed, 8 Jun 2011 20:48:44 +0200 [thread overview]
Message-ID: <1307558930-16074-14-git-send-email-srabbelier@gmail.com> (raw)
In-Reply-To: <1307558930-16074-1-git-send-email-srabbelier@gmail.com>
Previously the status code of all helpers were ignored, allowing
errors that occur to go unnoticed if the error text output by the
helper is not noticed.
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
---
Changed from the original only to address style nits.
transport-helper.c | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index ecb44f6..7f3c6c6 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -204,6 +204,7 @@ static int disconnect_helper(struct transport *transport)
{
struct helper_data *data = transport->data;
struct strbuf buf = STRBUF_INIT;
+ int res = 0;
if (data->helper) {
if (debug)
@@ -215,13 +216,13 @@ static int disconnect_helper(struct transport *transport)
close(data->helper->in);
close(data->helper->out);
fclose(data->out);
- finish_command(data->helper);
+ res = finish_command(data->helper);
free((char *)data->helper->argv[0]);
free(data->helper->argv);
free(data->helper);
data->helper = NULL;
}
- return 0;
+ return res;
}
static const char *unsupported_options[] = {
@@ -299,12 +300,13 @@ static void standard_options(struct transport *t)
static int release_helper(struct transport *transport)
{
+ int res = 0;
struct helper_data *data = transport->data;
free_refspec(data->refspec_nr, data->refspecs);
data->refspecs = NULL;
- disconnect_helper(transport);
+ res = disconnect_helper(transport);
free(transport->data);
- return 0;
+ return res;
}
static int fetch_with_fetch(struct transport *transport,
@@ -410,8 +412,11 @@ static int fetch_with_import(struct transport *transport,
sendline(data, &buf);
strbuf_reset(&buf);
}
- disconnect_helper(transport);
- finish_command(&fastimport);
+ if (disconnect_helper(transport))
+ die("Error while disconnecting helper");
+ if (finish_command(&fastimport))
+ die("Error while running fast-import");
+
free(fastimport.argv);
fastimport.argv = NULL;
@@ -755,8 +760,10 @@ static int push_refs_with_export(struct transport *transport,
die("Couldn't run fast-export");
data->no_disconnect_req = 1;
- finish_command(&exporter);
- disconnect_helper(transport);
+ if (finish_command(&exporter))
+ die("Error while running fast-export");
+ if (disconnect_helper(transport))
+ die("Error while disconnecting helper");
return 0;
}
--
1.7.5.1.292.g728120
next prev parent reply other threads:[~2011-06-08 18:50 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-08 18:48 [PATCH 00/19] remote-helper improvements Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 01/19] transport-helper: fix minor leak in push_refs_with_export Sverre Rabbelier
2011-06-08 21:57 ` Jeff King
2011-06-08 22:08 ` Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 02/19] t5800: factor out some ref tests Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 03/19] t5800: document some non-functional parts of remote helpers Sverre Rabbelier
2011-06-08 19:28 ` Jonathan Nieder
2011-06-08 19:36 ` Jonathan Nieder
2011-06-08 19:51 ` Sverre Rabbelier
2011-06-08 21:13 ` Sverre Rabbelier
2011-06-09 12:45 ` Sverre Rabbelier
2011-06-10 1:18 ` Jeff King
2011-06-08 18:48 ` [PATCH 04/19] teach remote-testgit to import non-HEAD refs Sverre Rabbelier
2011-06-08 19:30 ` Jonathan Nieder
2011-06-08 19:47 ` Sverre Rabbelier
2011-06-08 22:15 ` Jeff King
2011-06-08 23:48 ` Junio C Hamano
2011-06-09 6:23 ` Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 05/19] transport-helper: don't feed bogus refs to export push Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 06/19] git_remote_helpers: push all refs during a non-local export Sverre Rabbelier
2011-06-08 19:42 ` Jonathan Nieder
2011-06-08 22:19 ` Jeff King
2011-06-08 22:21 ` Sverre Rabbelier
2011-06-09 8:09 ` Jonathan Nieder
2011-06-09 8:29 ` Sverre Rabbelier
2011-06-09 8:43 ` Jonathan Nieder
2011-06-09 10:26 ` Sverre Rabbelier
2011-06-10 1:40 ` Jeff King
2011-06-08 18:48 ` [PATCH 07/19] remote-curl: accept empty line as terminator Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 08/19] git-remote-testgit: only push for non-local repositories Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 09/19] git-remote-testgit: fix error handling Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 10/19] fast-import: introduce 'done' command Sverre Rabbelier
2011-06-08 20:03 ` Jonathan Nieder
2011-06-08 20:07 ` Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 11/19] fast-export: support done feature Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 12/19] transport-helper: factor out push_update_refs_status Sverre Rabbelier
2011-06-08 18:48 ` Sverre Rabbelier [this message]
2011-06-08 18:48 ` [PATCH 14/19] transport-helper: use the new done feature where possible Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 15/19] transport-helper: update ref status after push with export Sverre Rabbelier
2011-06-09 9:10 ` Jonathan Nieder
2011-06-09 10:23 ` Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 16/19] transport-helper: change import semantics Sverre Rabbelier
2011-06-08 20:47 ` Jonathan Nieder
2011-06-08 20:52 ` Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 17/19] transport-helper: export is no longer always the last command Sverre Rabbelier
2011-06-09 1:07 ` Junio C Hamano
2011-06-09 6:48 ` Sverre Rabbelier
2011-06-09 7:51 ` Jonathan Nieder
2011-06-09 8:28 ` Sverre Rabbelier
2011-06-13 15:24 ` Junio C Hamano
2011-06-08 18:48 ` [PATCH 18/19] transport-helper: Use capname for gitdir capability too Sverre Rabbelier
2011-06-08 20:54 ` Jonathan Nieder
2011-06-08 20:57 ` Sverre Rabbelier
2011-06-08 18:48 ` [PATCH 19/19] transport-helper: implement marks location as capability Sverre Rabbelier
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=1307558930-16074-14-git-send-email-srabbelier@gmail.com \
--to=srabbelier@gmail.com \
--cc=artagnon@gmail.com \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
/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).