android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2025-04-02 14:09:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

project: run fetch --refetch on unable to not parse commit

Browse Source 
Similarly to e59e2ae757623e64f625a9cdadf1c2010ef82b34, handle missing
gc'ed commits by running `git fetch --refetch`.

R=jojwang@google.com

Bug: b/360889369
Bug: b/371000949
Change-Id: I108b870b855d3b9f23665afa134c6e35f7cd2830
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/438461
Reviewed-by: Joanna Wang <jojwang@google.com>
Tested-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
This commit is contained in:
Josip Sokcevic 2024-10-02 18:05:48 +00:00 committed by LUCI
parent 621de7ed12
commit cfe3095e50
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
project.py
View File

@ -2664,7 +2664,10 @@ class Project:
# TODO(b/360889369#comment24): git may gc commits incorrectly. # TODO(b/360889369#comment24): git may gc commits incorrectly.
# Until the root cause is fixed, retry fetch with --refetch which # Until the root cause is fixed, retry fetch with --refetch which
# will bring the repository into a good state. # will bring the repository into a good state.
elif gitcmd.stdout and "could not parse commit" in gitcmd.stdout: elif gitcmd.stdout and (
"could not parse commit" in gitcmd.stdout
or "unable to parse commit" in gitcmd.stdout
):
cmd.insert(1, "--refetch") cmd.insert(1, "--refetch")
print( print(
"could not parse commit error, retrying with refetch", "could not parse commit error, retrying with refetch",