| commit | cba2a678a12bad4d58eadf48c3a75efb6e1fa094 | [log] [tgz] |
|---|---|---|
| author | Sam Elliott <selliott@lowrisc.org> | Tue May 12 17:33:06 2020 +0100 |
| committer | Philipp Wagner <mail@philipp-wagner.com> | Wed May 20 23:12:42 2020 +0100 |
| tree | ffed86612e9f0ea804abab39f2c582507923b464 | |
| parent | 70b98e25e1ff28064d3301306098a33949463f10 [diff] |
[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>
OpenTitan is an open source silicon Root of Trust (RoT) project. OpenTitan will make the silicon RoT design and implementation more transparent, trustworthy, and secure for enterprises, platform providers, and chip manufacturers. OpenTitan is administered by lowRISC CIC as a collaborative project to produce high quality, open IP for instantiation as a full-featured product. See the OpenTitan site and OpenTitan docs for more information about the project.
This repository contains hardware, software and utilities written as part of the OpenTitan project. It is structured as monolithic repository, or “monorepo”, where all components live in one repository. It exists to enable collaboration across partners participating in the OpenTitan project.
The project contains comprehensive documentation of all IPs and tools. You can access it online at docs.opentitan.org.
Have a look at CONTRIBUTING for guidelines on how to contribute code to this repository.
Unless otherwise noted, everything in this repository is covered by the Apache License, Version 2.0 (see LICENSE for full text).