Re: [PATCH v5 1/3] push: add reflog check for "--force-if-includes"
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 23, 2020, 16:29 UTC
- Message-ID
- <xmqqeemsjw2u.fsf@gitster.c.googlers.com>
- In-Reply-To
- <20200923073022.61293-2-shrinidhi.kaushik@gmail.com>
Srinidhi Kaushik <shrinidhi.kaushik@gmail.com> writes:
Show 14 quoted lines
> diff --git a/remote.h b/remote.h
> index 5e3ea5a26d..7c5e59770e 100644
> --- a/remote.h
> +++ b/remote.h
> @@ -104,7 +104,11 @@ struct ref {
> forced_update:1,
> expect_old_sha1:1,
> exact_oid:1,
> - deletion:1;
> + deletion:1,
> + /* Need to check if local reflog reaches the remote tip. */
> + check_reachable:1,
> + /* The local reflog does not reach the remote tip. */
> + unreachable:1;I know the comment text above is what I suggested, but it may be more useful to readers to explain the latter as
/* ... the result of the above check */ unreachable:1;
Thanks.