shejialuo <shejialuo@xxxxxxxxx> writes:
> builtin/fsck.c | 28 ++++++++++++++++++++++++++++
> 1 file changed, 28 insertions(+)
>
> diff --git a/builtin/fsck.c b/builtin/fsck.c
> index 0196c54eb6..a10e52b601 100644
> --- a/builtin/fsck.c
> +++ b/builtin/fsck.c
> @@ -902,6 +902,32 @@ static int check_pack_rev_indexes(struct repository *r, int show_progress)
> return res;
> }
>
> +static void fsck_refs(void)
> +{
> + struct child_process refs_verify = CHILD_PROCESS_INIT;
> + struct progress *progress = NULL;
> +
> + if (show_progress)
> + progress = start_progress(_("Checking ref database"), 1);
This had an obvious semantic conflicts with a topic in flight.
I've resolved it in the latest integration after pushing out the
2.48-rc2 this morning, so there is no need to resend, but please
remember that it would be a possibility to rebase on top of an
updated 'master' *IF* the other topic graduates to 'master' a lot
earlier than this topic hits 'next' (IOW, until that happens there
is no need to rebase).
Thanks.
