Re: [PATCH v3 2/2] transport-helper: check if remote helper is alive
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 7, 2013, 17:49 UTC
- Message-ID
- <7vwqse2pu0.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1365320706-13539-3-git-send-email-felipe.contreras@gmail.com>
Felipe Contreras <felipe.contreras@gmail.com> writes:
> Otherwise transport-helper will continue checking for refs and other > things what will confuse the user more. > ---
Sign-off?
Show 17 quoted lines
> git-remote-testgit | 11 +++++++++++ > t/t5801-remote-helpers.sh | 19 +++++++++++++++++++ > transport-helper.c | 8 ++++++++ > 3 files changed, 38 insertions(+) > > diff --git a/git-remote-testgit b/git-remote-testgit > index b395c8d..ca0cf09 100755 > --- a/git-remote-testgit > +++ b/git-remote-testgit > @@ -61,12 +61,23 @@ do > echo "feature import-marks=$gitmarks" > echo "feature export-marks=$gitmarks" > fi > + > + if test -n "$GIT_REMOTE_TESTGIT_FAILURE" > + then > + exit -1
It is rather unusual to see a negative return value returned from a shell script. Shouldn't this be something like 127 (or 1)?
Show 54 quoted lines
> diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
> index f387027..efe67e2 100755
> --- a/t/t5801-remote-helpers.sh
> +++ b/t/t5801-remote-helpers.sh
> @@ -166,4 +166,23 @@ test_expect_success 'push ref with existing object' '
> compare_refs local dup server dup
> '
>
> +test_expect_success 'proper failure checks for fetching' '
> + (GIT_REMOTE_TESTGIT_FAILURE=1 &&
> + export GIT_REMOTE_TESTGIT_FAILURE &&
> + cd local &&
> + test_must_fail git fetch 2> error &&
> + grep "Error while running helper" error
> + )
> +'
> +
> +# We sleep to give fast-export a chance to catch the SIGPIPE
> +test_expect_failure 'proper failure checks for pushing' '
> + (GIT_REMOTE_TESTGIT_FAILURE=1 &&
> + export GIT_REMOTE_TESTGIT_FAILURE &&
> + cd local &&
> + test_must_fail git push --all 2> error &&
> + grep "Error while running helper" error
> + )
> +'
> +
> test_done
> diff --git a/transport-helper.c b/transport-helper.c
> index cb3ef7d..dfdfa7a 100644
> --- a/transport-helper.c
> +++ b/transport-helper.c
> @@ -460,6 +460,10 @@ static int fetch_with_import(struct transport *transport,
>
> if (finish_command(&fastimport))
> die("Error while running fast-import");
> +
> + if (!check_command(data->helper))
> + die("Error while running helper");
> +
> argv_array_free_detached(fastimport.argv);
>
> /*
> @@ -818,6 +822,10 @@ static int push_refs_with_export(struct transport *transport,
>
> if (finish_command(&exporter))
> die("Error while running fast-export");
> +
> + if (!check_command(data->helper))
> + die("Error while running helper");
> +
> push_update_refs_status(data, remote_refs);
> return 0;
> }