From: John Keeping <john@keeping.me.uk>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 2/3] push: add shorthand for --force-with-lease branch creation
Date: Tue, 26 Jul 2016 21:42:53 +0100 [thread overview]
Message-ID: <20160726204253.ciumvungwfwaw6el@john.keeping.me.uk> (raw)
In-Reply-To: <xmqqwpk8yxvb.fsf@gitster.mtv.corp.google.com>
On Tue, Jul 26, 2016 at 12:59:04PM -0700, Junio C Hamano wrote:
> John Keeping <john@keeping.me.uk> writes:
>
> >> > @@ -2294,6 +2294,8 @@ int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unse
> >> > entry = add_cas_entry(cas, arg, colon - arg);
> >> > if (!*colon)
> >> > entry->use_tracking = 1;
> >> > + else if (!colon[1])
> >> > + memset(entry->expect, 0, sizeof(entry->expect));
> >>
> >> hashclr()?
> >
> > Yes (and in the following patch as well). I hadn't realised that
> > function exists.
>
> Thanks; I've locally tweaked these two patches; the interdiff looks
> like this.
Thanks. I'm about to send v3 anyway to pull a test forward to address
Jakub's comment. I also used oidclr() for the last two changes below.
> remote.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/remote.c b/remote.c
> index e8b7bac..7eaf3c8 100644
> --- a/remote.c
> +++ b/remote.c
> @@ -2304,7 +2304,7 @@ int parse_push_cas_option(struct push_cas_option *cas, const char *arg, int unse
> if (!*colon)
> entry->use_tracking = 1;
> else if (!colon[1])
> - memset(entry->expect, 0, sizeof(entry->expect));
> + hashclr(entry->expect);
> else if (get_sha1(colon + 1, entry->expect))
> return error("cannot parse expected object name '%s'", colon + 1);
> return 0;
> @@ -2354,7 +2354,7 @@ static void apply_cas(struct push_cas_option *cas,
> if (!entry->use_tracking)
> hashcpy(ref->old_oid_expect.hash, cas->entry[i].expect);
> else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
> - memset(&ref->old_oid_expect, 0, sizeof(ref->old_oid_expect));
> + hashclr(ref->old_oid_expect.hash);
> return;
> }
>
> @@ -2364,7 +2364,7 @@ static void apply_cas(struct push_cas_option *cas,
>
> ref->expect_old_sha1 = 1;
> if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
> - memset(&ref->old_oid_expect, 0, sizeof(ref->old_oid_expect));
> + hashclr(ref->old_oid_expect.hash);
> }
>
> void apply_push_cas(struct push_cas_option *cas,
next prev parent reply other threads:[~2016-07-26 20:43 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-23 15:31 [PATCH] push: allow pushing new branches with --force-with-lease John Keeping
2016-07-25 17:28 ` Junio C Hamano
2016-07-25 21:59 ` [PATCH v2 0/3] " John Keeping
2016-07-25 22:21 ` Junio C Hamano
2016-07-26 20:44 ` [PATCH v3 " John Keeping
2016-07-26 20:44 ` [PATCH v3 1/3] Documentation/git-push: fix placeholder formatting John Keeping
2016-07-26 20:44 ` [PATCH v3 2/3] push: add shorthand for --force-with-lease branch creation John Keeping
2016-07-26 20:44 ` [PATCH v3 3/3] push: allow pushing new branches with --force-with-lease John Keeping
2016-07-25 21:59 ` [PATCH v2 1/3] Documentation/git-push: fix placeholder formatting John Keeping
2016-07-25 21:59 ` [PATCH v2 2/3] push: add shorthand for --force-with-lease branch creation John Keeping
2016-07-25 22:22 ` Junio C Hamano
2016-07-26 8:03 ` John Keeping
2016-07-26 19:59 ` Junio C Hamano
2016-07-26 20:42 ` John Keeping [this message]
2016-07-26 21:19 ` Junio C Hamano
2016-07-26 10:30 ` Jakub Narębski
2016-07-26 11:19 ` John Keeping
2016-07-25 21:59 ` [PATCH v2 3/3] push: allow pushing new branches with --force-with-lease John Keeping
2016-07-25 22:11 ` [PATCH] " Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160726204253.ciumvungwfwaw6el@john.keeping.me.uk \
--to=john@keeping.me.uk \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).