From: Sverre Rabbelier <srabbelier@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>, Jeff King <peff@peff.net>,
Git List <git@vger.kernel.org>,
Daniel Barkalow <barkalow@iabervon.org>,
Ramkumar
Cc: Sverre Rabbelier <srabbelier@gmail.com>
Subject: [PATCH v3 15/23] transport-helper: check status code of finish_command
Date: Sat, 16 Jul 2011 15:03:35 +0200 [thread overview]
Message-ID: <1310821424-4750-16-git-send-email-srabbelier@gmail.com> (raw)
In-Reply-To: <1310821424-4750-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>
---
Unchanged
transport-helper.c | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index dd8dd2c..e02f4a3 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -209,6 +209,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)
@@ -220,13 +221,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[] = {
@@ -304,12 +305,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,
@@ -415,8 +417,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;
@@ -760,8 +765,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-07-16 13:05 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-16 13:03 [PATCH v3 00/23] remote-helper improvements Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 01/23] transport-helper: fix minor leak in push_refs_with_export Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 02/23] t5800: factor out some ref tests Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 03/23] t5800: use skip_all instead of prereq Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 04/23] t5800: document some non-functional parts of remote helpers Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 05/23] git-remote-testgit: import non-HEAD refs Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 06/23] transport-helper: don't feed bogus refs to export push Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 07/23] git_remote_helpers: push all refs during a non-local export Sverre Rabbelier
2011-07-17 23:36 ` Junio C Hamano
2011-07-23 11:27 ` Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 08/23] remote-helpers: export GIT_DIR variable to helpers Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 09/23] remote-curl: accept empty line as terminator Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 10/23] git-remote-testgit: only push for non-local repositories Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 11/23] git-remote-testgit: fix error handling Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 12/23] fast-import: introduce 'done' command Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 13/23] fast-export: support done feature Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 14/23] transport-helper: factor out push_update_refs_status Sverre Rabbelier
2011-07-16 13:03 ` Sverre Rabbelier [this message]
2011-07-16 13:03 ` [PATCH v3 16/23] transport-helper: use the new done feature where possible Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 17/23] transport-helper: update ref status after push with export Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 18/23] transport-helper: change import semantics Sverre Rabbelier
2011-07-18 11:13 ` Dmitry Ivankov
2011-07-16 13:03 ` [PATCH v3 19/23] transport-helper: Use capname for refspec capability too Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 20/23] transport-helper: implement marks location as capability Sverre Rabbelier
2011-07-16 13:03 ` [PATCH v3 21/23] transport-helper: die early on encountering deleted refs Sverre Rabbelier
2011-07-16 13:03 ` [RFD/PATCH v3 22/23] t5800: document inability to push new branch with old content Sverre Rabbelier
2011-07-16 13:03 ` [RDD/PATCH v3 23/23] t5800: point out that deleting branches does not work Sverre Rabbelier
2011-07-18 3:28 ` [PATCH v3 00/23] remote-helper improvements Jeff King
2011-07-23 11:28 ` 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=1310821424-4750-16-git-send-email-srabbelier@gmail.com \
--to=srabbelier@gmail.com \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).