public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Felipe Contreras <felipe.contreras@gmail•com>
Cc: git@vger•kernel.org, Richard Hansen <rhansen@bbn•com>,
	Max Horn <max@quendi•de>
Subject: Re: [PATCH v9 0/6] transport-helper: fixes
Date: Fri, 18 Apr 2014 18:09:11 -0700	[thread overview]
Message-ID: <xmqqtx9q9lc8.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <5351b6219fce_3497cdf30c6e@nysa.notmuch> (Felipe Contreras's message of "Fri, 18 Apr 2014 18:32:49 -0500")

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

> Junio C Hamano wrote:
>> Felipe Contreras <felipe.contreras@gmail•com> writes:
>> 
>> > 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)?
>
> I think I saw gitk report "Branches: remotes/origin/pu", but OK.

I don't get that "but" part, but as I said, if what you wanted to
apply has further updates relative to what we have, please send in
incremental.  The patches did not apply cleanly near the tip of
'master', so I didn't check what could be missing myself.

Thanks.

     prev parent reply	other threads:[~2014-04-19  1:09 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-12 20:12 [PATCH v9 0/6] transport-helper: fixes Felipe Contreras
2014-04-12 20:12 ` [PATCH v9 1/6] transport-helper: mismerge fix Felipe Contreras
2014-04-12 20:12 ` [PATCH v9 2/6] transport-helper: don't update refs in dry-run Felipe Contreras
2014-04-12 20:12 ` [PATCH v9 3/6] transport-helper: add 'force' to 'export' helpers Felipe Contreras
2014-04-12 20:12 ` [PATCH v9 4/6] transport-helper: check for 'forced update' message Felipe Contreras
2014-04-12 20:12 ` [PATCH v9 5/6] test-hg.sh: tests are now expected to pass Felipe Contreras
2014-04-12 20:12 ` [PATCH v9 6/6] remote-bzr: support the new 'force' option Felipe Contreras
2014-04-14 20:41 ` [PATCH v9 0/6] transport-helper: fixes Junio C Hamano
2014-04-15 21:25   ` Junio C Hamano
2014-04-18 23:32   ` Felipe Contreras
2014-04-19  1:09     ` Junio C Hamano [this message]

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=xmqqtx9q9lc8.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=felipe.contreras@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=max@quendi$(echo .)de \
    --cc=rhansen@bbn$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox