[util] Fix Vendor Reset Revision
The vendor tool can fail if you try to `git-reset` to a branch that does
not exist.
When cloning a repository to create patches, we almost always need to
check out a branch or revision that is not `master`, but cloning a repo
only creates the `master` branch, so the `git-reset` can fail if given
an upstream branch name (which doesn't yet exist in the clone).
One issue we have is that we want to be able to pass either an upstream
branch name or a git revision sha, and we don't know which we have
(because they use the same key in the configuration). If we use
`git-checkout` instead of `git-reset`, then the checkout operation will
create a local branch that matches the upstream branch of the same name
(if given a branch name), or will checkout a git revision sha if given
a sha.
This is the most minimal change that we can do, and means the vendor
tool does not have to guess when it should add the upstream prefix to
the branch name.
This ensures that the clone operation will not fail when refreshing
patches, but also if a non-master branch is specified in the vendor
configuration.
Signed-off-by: Sam Elliott <selliott@lowrisc.org>
diff --git a/util/vendor.py b/util/vendor.py
index 2a0bcb4..e2fb818 100755
--- a/util/vendor.py
+++ b/util/vendor.py
@@ -232,7 +232,7 @@
subprocess.run(cmd, check=True)
# Check out exactly the revision requested
- cmd = ['git', '-C', str(clone_dir), 'reset', '--hard', rev]
+ cmd = ['git', '-C', str(clone_dir), 'checkout', '--force', rev]
if not verbose:
cmd += ['-q']
subprocess.run(cmd, check=True)
