qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: "Daniel P. Berrangé" <berrange@redhat.com>
Cc: qemu-devel@nongnu.org,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Thomas Huth" <thuth@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>
Subject: Re: [PATCH] gitlab: use --refetch in check-patch/check-dco jobs
Date: Tue, 25 Feb 2025 07:20:29 -0500	[thread overview]
Message-ID: <20250225072011-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20250225110525.2209854-1-berrange@redhat.com>

On Tue, Feb 25, 2025 at 11:05:25AM +0000, Daniel P. Berrangé wrote:
> When gitlab initializes the repo checkout for a CI job, it will have
> done a shallow clone with only partial history. Periodically the objects
> that are omitted cause trouble with the check-patch/check-dco jobs. This
> is exhibited as reporting strange errors being unable to fetch certain
> objects that are known to exist.
> 
> Passing the --refetch flag to 'git fetch' causes it to not assume the
> local checkout has all common objects and thus re-fetch everything that
> is needed. This appears to solve the check-patch/check-dco job failures.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

Thanks!

Acked-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  .gitlab-ci.d/check-dco.py   | 2 +-
>  .gitlab-ci.d/check-patch.py | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/.gitlab-ci.d/check-dco.py b/.gitlab-ci.d/check-dco.py
> index 70dec7d6ee..2fd56683dc 100755
> --- a/.gitlab-ci.d/check-dco.py
> +++ b/.gitlab-ci.d/check-dco.py
> @@ -21,7 +21,7 @@
>  
>  print(f"adding upstream git repo @ {repourl}")
>  subprocess.check_call(["git", "remote", "add", "check-dco", repourl])
> -subprocess.check_call(["git", "fetch", "check-dco", "master"])
> +subprocess.check_call(["git", "fetch", "--refetch", "check-dco", "master"])
>  
>  ancestor = subprocess.check_output(["git", "merge-base",
>                                      "check-dco/master", "HEAD"],
> diff --git a/.gitlab-ci.d/check-patch.py b/.gitlab-ci.d/check-patch.py
> index 68c549a146..be13e6f77d 100755
> --- a/.gitlab-ci.d/check-patch.py
> +++ b/.gitlab-ci.d/check-patch.py
> @@ -24,7 +24,7 @@
>  # base for the user's branch. We thus need to figure out a common
>  # ancestor between the user's branch and current git master.
>  subprocess.check_call(["git", "remote", "add", "check-patch", repourl])
> -subprocess.check_call(["git", "fetch", "check-patch", "master"])
> +subprocess.check_call(["git", "fetch", "--refetch", "check-patch", "master"])
>  
>  ancestor = subprocess.check_output(["git", "merge-base",
>                                      "check-patch/master", "HEAD"],
> -- 
> 2.47.1



  reply	other threads:[~2025-02-25 12:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-25 11:05 [PATCH] gitlab: use --refetch in check-patch/check-dco jobs Daniel P. Berrangé
2025-02-25 12:20 ` Michael S. Tsirkin [this message]
2025-02-28 15:36 ` Alex Bennée

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=20250225072011-mutt-send-email-mst@kernel.org \
    --to=mst@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=berrange@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.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.
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 NNTP newsgroup(s).