diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-10-23 12:08:34 +0100 |
---|---|---|
committer | Sam Thursfield <sam@afuera.me.uk> | 2014-10-24 16:59:00 +0000 |
commit | c255fc68775fe4c5975155c2932b3ed6ee3625c1 (patch) | |
tree | 4a0774f36f9034d8d3a1d7f4d010fad7a80f2cd8 /.gitignore | |
parent | 35178357f0ba7eafdeebfc621d70ba69f2cd270a (diff) | |
download | morph-c255fc68775fe4c5975155c2932b3ed6ee3625c1.tar.gz |
build: Resolve the ref being built in the user's local definitions.git
Most usefully, this patch means that Morph no longer updates its cached
copy of definitions.git every time you run `morph build`.
Also, it prevents confusion in the following situation. Imagine I have
run:
morph checkout baserock:baserock/definitions master
I then wait a while, during which time someone pushes to 'master' in the
definitions.git repo that I cloned from. Now I run:
cd master
morph build systems/whatever.morph
Which commit does it build, the local head of 'master' or the remote
head of 'master'?
The answer, both before and after this patch, is that it builds the
local version of master. But previously, this only happened because of
the magic that we have to detect local changes. With this patch, the
local change detection could be disabled and `morph build` would still
build what the user had checked out as 'master' locally, not whatever
'master' pointed to in the remote repo.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions