[taler-merchant] branch master updated: bootstrap script checkout the latest from origin/prebuilt

[gnunet]

This is an automated email from the git hooks/post-receive script.

sebasjm pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new dc71bee5 bootstrap script checkout the latest from origin/prebuilt
dc71bee5 is described below

commit dc71bee5b50aaa59b2fe4535cc288b4aaab481fc
Author: Sebastian <sebasjm@gmail.com>
AuthorDate: Mon Aug 9 15:14:11 2021 -0300

    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
---
 bootstrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ../..
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.