diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-01 20:00:30 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-06-16 16:03:20 +0000 |
| commit | a500b2a432148040ae826c960c5693812c574e09 (patch) | |
| tree | f0d6d14cb15525df5bf4e1a976656951202fd10d /morphlib/gitdir.py | |
| parent | 665ea01218dcba658d95b86014c7da5dd974a8a7 (diff) | |
| download | morph-a500b2a432148040ae826c960c5693812c574e09.tar.gz | |
Use DefinitionsRepo in build command
This allows using `morph build`, `morph distbuild` and `morph
distbuild-start` from any Git checkout of a definitions.git repo, so
nobody needs to use `morph checkout` or `morph branch` if they don't
want to.
Change-Id: I5fdfae0f8bec1953893e26f0d227e289da11fa84
Diffstat (limited to 'morphlib/gitdir.py')
| -rw-r--r-- | morphlib/gitdir.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/morphlib/gitdir.py b/morphlib/gitdir.py index 8716da16..48fab3fe 100644 --- a/morphlib/gitdir.py +++ b/morphlib/gitdir.py @@ -618,6 +618,9 @@ class GitDirectory(object): # ref wasn't a branch, can't have upstream # treat it the same as no upstream for convenience return None + elif 'No such branch' in emsg: + # Same as above + return None elif 'No upstream configured for branch' in emsg: return None raise |