summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian <sebasjm@gmail.com>2021-08-09 15:14:11 -0300
committerSebastian <sebasjm@gmail.com>2021-08-09 15:14:19 -0300
commitdc71bee5b50aaa59b2fe4535cc288b4aaab481fc (patch)
treeba35f81e62c656bcdbcade3e795f8d5ad167f369
parentd30d8132604bdfde5056aa3a18ef86ee336796c3 (diff)
downloadmerchant-dc71bee5b50aaa59b2fe4535cc288b4aaab481fc.tar.gz
merchant-dc71bee5b50aaa59b2fe4535cc288b4aaab481fc.tar.bz2
merchant-dc71bee5b50aaa59b2fe4535cc288b4aaab481fc.zip
bootstrap script checkout the latest from origin/prebuilt
checking out origin miss the fact that we need to move the local branch pointer to the last remote commit by now, we dont care about the local content of the contrib/merchant-backoffice folder so is ok to always force the checkout
-rwxr-xr-xbootstrap2
1 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap b/bootstrap
index e3e4d3d4..0ee94f8d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -34,7 +34,7 @@ autoreconf -if
echo "Importing single-page app (from external Git repository)"
cd contrib/merchant-backoffice
-git checkout prebuilt
+git checkout -f origin/prebuilt
cp spa.html ..
cd ../..