Re: [PATCH v2 2/3] push: add shorthand for --force-with-lease branch creation
John Keeping writes: > 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. Will replace with v3. I think v3 is ready to advance to 'next'. Let's see if we get further comments from others for a few days. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 2/3] push: add shorthand for --force-with-lease branch creation
On Tue, Jul 26, 2016 at 12:59:04PM -0700, Junio C Hamano wrote:
> John Keeping 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,
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 2/3] push: add shorthand for --force-with-lease branch creation
John Keeping 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.
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,
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 2/3] push: add shorthand for --force-with-lease branch creation
On Tue, Jul 26, 2016 at 12:30:05PM +0200, Jakub Narębski wrote: > W dniu 2016-07-25 o 23:59, John Keeping pisze: > > > +test_expect_success 'new branch covered by force-with-lease (explicit)' ' > > + setup_srcdst_basic && > > + ( > > + cd dst && > > + git branch branch master && > > + git push --force-with-lease=branch: origin branch > > + ) && > > + git ls-remote dst refs/heads/branch >expect && > > + git ls-remote src refs/heads/branch >actual && > > + test_cmp expect actual > > +' > > Do we need to test the negative, that is that if branch is not > new it prevents push (e.g. when is HEAD), or is it > covered by other tests? It's covered by a test in patch 3 (at least for the implicit case added there), but I could pull that forwards. In fact, converting that test to the explicit syntax will make it simpler since we won't need to set up a non-fast-forward push. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 2/3] push: add shorthand for --force-with-lease branch creation
W dniu 2016-07-25 o 23:59, John Keeping pisze: > +test_expect_success 'new branch covered by force-with-lease (explicit)' ' > + setup_srcdst_basic && > + ( > + cd dst && > + git branch branch master && > + git push --force-with-lease=branch: origin branch > + ) && > + git ls-remote dst refs/heads/branch >expect && > + git ls-remote src refs/heads/branch >actual && > + test_cmp expect actual > +' Do we need to test the negative, that is that if branch is not new it prevents push (e.g. when is HEAD), or is it covered by other tests? -- Jakub Narębski -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 2/3] push: add shorthand for --force-with-lease branch creation
On Mon, Jul 25, 2016 at 03:22:48PM -0700, Junio C Hamano wrote:
> John Keeping writes:
>
> > Allow the empty string to stand in for the null SHA-1 when pushing a new
> > branch, like we do when deleting branches.
> >
> > This means that the following command ensures that `new-branch` is
> > created on the remote (that is, is must not already exist):
> >
> > git push --force-with-lease=new-branch: origin new-branch
> >
> > Signed-off-by: John Keeping
> > ---
> > New in v2.
> >
> > Documentation/git-push.txt | 3 ++-
> > remote.c | 2 ++
> > t/t5533-push-cas.sh| 12
> > 3 files changed, 16 insertions(+), 1 deletion(-)
> >
> > diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
> > index bf7c9a2..927a034 100644
> > --- a/Documentation/git-push.txt
> > +++ b/Documentation/git-push.txt
> > @@ -201,7 +201,8 @@ if it is going to be updated, by requiring its current
> > value to be
> > the same as the specified value `` (which is allowed to be
> > different from the remote-tracking branch we have for the refname,
> > or we do not even have to have such a remote-tracking branch when
> > -this form is used).
> > +this form is used). If `` is the empty string, then the named ref
> > +must not already exist.
> > +
> > Note that all forms other than `--force-with-lease=:`
> > that specifies the expected current value of the ref explicitly are
> > diff --git a/remote.c b/remote.c
> > index a326e4e..af94892 100644
> > --- a/remote.c
> > +++ b/remote.c
> > @@ -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.
> > else if (get_sha1(colon + 1, entry->expect))
> > return error("cannot parse expected object name '%s'", colon +
> > 1);
> > return 0;
> > diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh
> > index c732012..5e7f6e9 100755
> > --- a/t/t5533-push-cas.sh
> > +++ b/t/t5533-push-cas.sh
> > @@ -191,4 +191,16 @@ test_expect_success 'cover everything with default
> > force-with-lease (allowed)' '
> > test_cmp expect actual
> > '
> >
> > +test_expect_success 'new branch covered by force-with-lease (explicit)' '
> > + setup_srcdst_basic &&
> > + (
> > + cd dst &&
> > + git branch branch master &&
> > + git push --force-with-lease=branch: origin branch
> > + ) &&
> > + git ls-remote dst refs/heads/branch >expect &&
> > + git ls-remote src refs/heads/branch >actual &&
> > + test_cmp expect actual
> > +'
> > +
> > test_done
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 2/3] push: add shorthand for --force-with-lease branch creation
John Keeping writes:
> Allow the empty string to stand in for the null SHA-1 when pushing a new
> branch, like we do when deleting branches.
>
> This means that the following command ensures that `new-branch` is
> created on the remote (that is, is must not already exist):
>
> git push --force-with-lease=new-branch: origin new-branch
>
> Signed-off-by: John Keeping
> ---
> New in v2.
>
> Documentation/git-push.txt | 3 ++-
> remote.c | 2 ++
> t/t5533-push-cas.sh| 12
> 3 files changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
> index bf7c9a2..927a034 100644
> --- a/Documentation/git-push.txt
> +++ b/Documentation/git-push.txt
> @@ -201,7 +201,8 @@ if it is going to be updated, by requiring its current
> value to be
> the same as the specified value `` (which is allowed to be
> different from the remote-tracking branch we have for the refname,
> or we do not even have to have such a remote-tracking branch when
> -this form is used).
> +this form is used). If `` is the empty string, then the named ref
> +must not already exist.
> +
> Note that all forms other than `--force-with-lease=:`
> that specifies the expected current value of the ref explicitly are
> diff --git a/remote.c b/remote.c
> index a326e4e..af94892 100644
> --- a/remote.c
> +++ b/remote.c
> @@ -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()?
> else if (get_sha1(colon + 1, entry->expect))
> return error("cannot parse expected object name '%s'", colon +
> 1);
> return 0;
> diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh
> index c732012..5e7f6e9 100755
> --- a/t/t5533-push-cas.sh
> +++ b/t/t5533-push-cas.sh
> @@ -191,4 +191,16 @@ test_expect_success 'cover everything with default
> force-with-lease (allowed)' '
> test_cmp expect actual
> '
>
> +test_expect_success 'new branch covered by force-with-lease (explicit)' '
> + setup_srcdst_basic &&
> + (
> + cd dst &&
> + git branch branch master &&
> + git push --force-with-lease=branch: origin branch
> + ) &&
> + git ls-remote dst refs/heads/branch >expect &&
> + git ls-remote src refs/heads/branch >actual &&
> + test_cmp expect actual
> +'
> +
> test_done
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 2/3] push: add shorthand for --force-with-lease branch creation
Allow the empty string to stand in for the null SHA-1 when pushing a new
branch, like we do when deleting branches.
This means that the following command ensures that `new-branch` is
created on the remote (that is, is must not already exist):
git push --force-with-lease=new-branch: origin new-branch
Signed-off-by: John Keeping
---
New in v2.
Documentation/git-push.txt | 3 ++-
remote.c | 2 ++
t/t5533-push-cas.sh| 12
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index bf7c9a2..927a034 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -201,7 +201,8 @@ if it is going to be updated, by requiring its current
value to be
the same as the specified value `` (which is allowed to be
different from the remote-tracking branch we have for the refname,
or we do not even have to have such a remote-tracking branch when
-this form is used).
+this form is used). If `` is the empty string, then the named ref
+must not already exist.
+
Note that all forms other than `--force-with-lease=:`
that specifies the expected current value of the ref explicitly are
diff --git a/remote.c b/remote.c
index a326e4e..af94892 100644
--- a/remote.c
+++ b/remote.c
@@ -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));
else if (get_sha1(colon + 1, entry->expect))
return error("cannot parse expected object name '%s'", colon +
1);
return 0;
diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh
index c732012..5e7f6e9 100755
--- a/t/t5533-push-cas.sh
+++ b/t/t5533-push-cas.sh
@@ -191,4 +191,16 @@ test_expect_success 'cover everything with default
force-with-lease (allowed)' '
test_cmp expect actual
'
+test_expect_success 'new branch covered by force-with-lease (explicit)' '
+ setup_srcdst_basic &&
+ (
+ cd dst &&
+ git branch branch master &&
+ git push --force-with-lease=branch: origin branch
+ ) &&
+ git ls-remote dst refs/heads/branch >expect &&
+ git ls-remote src refs/heads/branch >actual &&
+ test_cmp expect actual
+'
+
test_done
--
2.9.2.639.g855ae9f
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
