Re: [PATCH v9 0/6] transport-helper: fixes

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 14, 2014, 20:41 UTC
Message-ID: <xmqq61mbod8y.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1397333575-11614-1-git-send-email-felipe.contreras@gmail.com>

Felipe Contreras <felipe.contreras@gmail.com> writes:

Show 16 quoted lines

> These patches add support for remote helpers --force, --dry-run, and reporting
> forced update.
>
> Changes since v8:
>
> --- a/transport-helper.c
> +++ b/transport-helper.c
> @@ -734,7 +734,7 @@ static int push_update_ref_status(struct strbuf *buf,
>         }
>  
>         (*ref)->status = status;
> -       (*ref)->forced_update = forced;
> +       (*ref)->forced_update |= forced;
>         (*ref)->remote_status = msg;
>         return !(status == REF_STATUS_OK);
>  }

Hmph, isn't v8 already in 'master' as of 90e6255a (Merge branch 'fc/transport-helper-fixes', 2014-03-18)?

Show 18 quoted lines

> Felipe Contreras (4):
>   transport-helper: mismerge fix
>   transport-helper: don't update refs in dry-run
>   transport-helper: add 'force' to 'export' helpers
>   transport-helper: check for 'forced update' message
>
> Richard Hansen (2):
>   test-hg.sh: tests are now expected to pass
>   remote-bzr: support the new 'force' option
>
>  Documentation/gitremote-helpers.txt   |  4 ++++
>  contrib/remote-helpers/git-remote-bzr | 31 ++++++++++++++++++++++++++++++-
>  contrib/remote-helpers/test-bzr.sh    | 22 +++++++++++++++++++++-
>  contrib/remote-helpers/test-hg.sh     |  4 ++--
>  git-remote-testgit.sh                 | 18 ++++++++++++++++++
>  t/t5801-remote-helpers.sh             | 13 +++++++++++++
>  transport-helper.c                    | 25 +++++++++++++++++--------
>  7 files changed, 105 insertions(+), 12 deletions(-)