|
@ -57,12 +57,14 @@ tmpdir_root=$(mktemp -d $tmpdir/$COMPONENT_NAME.root.XXXXXX) |
|
|
trap "clean_all" EXIT |
|
|
trap "clean_all" EXIT |
|
|
mount -t aufs -o br=$tmpdir_changes:$DOCKER_UPDATE_PATH/$COMPONENT_NAME -o udba=none none "$tmpdir_root" |
|
|
mount -t aufs -o br=$tmpdir_changes:$DOCKER_UPDATE_PATH/$COMPONENT_NAME -o udba=none none "$tmpdir_root" |
|
|
cd "$tmpdir_root" |
|
|
cd "$tmpdir_root" |
|
|
|
|
|
|
|
|
|
|
|
set -eux |
|
|
## XXXvlab: We probably would need to: |
|
|
## XXXvlab: We probably would need to: |
|
|
## - fetch only the module concerned |
|
|
## - fetch only the module concerned |
|
|
## - fetch only the ref concerned |
|
|
## - fetch only the ref concerned |
|
|
git fetch origin "$BRANCH" |
|
|
git fetch origin "$BRANCH" |
|
|
git checkout "$BRANCH" |
|
|
git checkout "$BRANCH" |
|
|
|
|
|
git reset --hard origin/$BRANCH |
|
|
|
|
|
#git reset --hard "origin/$BRANCH" |
|
|
git sub update |
|
|
git sub update |
|
|
|
|
|
|
|
|
cd / && |
|
|
cd / && |
|
|