diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-12-13 12:36:07 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-12-13 15:37:53 +0000 |
| commit | de50cec19b4f7e4c5a6da5ecc5cddd7a52ac3725 (patch) | |
| tree | 552fdae98cd0cc15d0b8a23ee225751b1d8ae374 /morphlib/git.py | |
| parent | d63c97a0bef1cd2f03ca266acda67cad065632df (diff) | |
| download | morph-de50cec19b4f7e4c5a6da5ecc5cddd7a52ac3725.tar.gz | |
Always use `git rev-parse --verify` to resolve refs
Previously some code used `git show-ref`, which is wrong -- given two
refs named 'alpha/master' and 'master', `git show-ref master` will
return both, sorted alphabetically. This can lead to build failures,
etc. due to refs resolving to the wrong SHAs.
We should also use `git rev-parse --verify` to verify SHA1s, which
we previously did with `git rev-list`.
Finally, `git rev-parse --verify` is more than twice as fast as
`git show-ref`.
Diffstat (limited to 'morphlib/git.py')
| -rw-r--r-- | morphlib/git.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/git.py b/morphlib/git.py index 7985b815..1c704337 100644 --- a/morphlib/git.py +++ b/morphlib/git.py @@ -256,4 +256,4 @@ def is_valid_sha1(ref): def rev_parse(runcmd, gitdir, ref): '''Find the sha1 for the given ref''' - return runcmd(['git', 'rev-parse', ref], cwd=gitdir)[0:40] + return runcmd(['git', 'rev-parse', '--verify', ref], cwd=gitdir)[0:40] |