global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-07 08:15:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

remote-helper: check helper status after import/export

Browse Source 
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
This commit is contained in:
Sverre Rabbelier
2011-07-24 00:06:00 +02:00
committed by Karsten Blees
parent c9d910d98c
commit 83ddf68836
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/clone.c
View File

@@ -947,7 +947,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
}
if (!is_local && !complete_refs_before_fetch)
transport_fetch_refs(transport, mapped_refs);
if (transport_fetch_refs(transport, mapped_refs))
die(_("could not fetch refs from %s"),
transport->url);
remote_head = find_ref_by_name(refs, "HEAD");
remote_head_points_at =

15
transport-helper.c
View File

@@ -441,6 +441,19 @@ static int get_exporter(struct transport *transport,
return start_command(fastexport);
}
static void check_helper_status(struct helper_data *data)
{
int pid, status;
pid = waitpid(data->helper->pid, &status, WNOHANG);
if (pid < 0)
die("Could not retrieve status of remote helper '%s'",
data->name);
if (pid > 0 && WIFEXITED(status))
die("Remote helper '%s' died with %d",
data->name, WEXITSTATUS(status));
}
static int fetch_with_import(struct transport *transport,
int nr_heads, struct ref **to_fetch)
{
@@ -476,6 +489,7 @@ static int fetch_with_import(struct transport *transport,
if (finish_command(&fastimport))
die("Error while running fast-import");
check_helper_status(data);
/*
* The fast-import stream of a remote helper that advertises
@@ -915,6 +929,7 @@ static int push_refs_with_export(struct transport *transport,
if (finish_command(&exporter))
die("Error while running fast-export");
check_helper_status(data);
if (push_update_refs_status(data, remote_refs, flags))
return 1;