c08ca8f922
Currently, when setting the `override-commit` key in the origin, the upgrader pulls that commit checksum directly and then updates the refspec to point to it. This behaviour was inherited from its ostree version; at the time it was implemented, the pull code didn't support passing a specific commit for a given refspec. However, we now have the override-commit-ids option, which will make libostree update the ref for us. We change the code here to make use of it and simplify the function. This also fixes the corner case of local branches: we shouldn't change the ref if we're on a local branch. This is actually what drove me to this patch as I was debugging #981. (Aside: I'm still not convinced updating the refspec is always the correct thing to do even in the remote case, though it's a bit messy to disentangle). Closes: #984 Approved by: cgwalters |
||
|---|---|---|
| .. | ||
| jsonutil.c | ||
| postprocess.c | ||
| test-basic.sh | ||
| test-ucontainer.sh | ||
| test-utils.c | ||