]> git.phdru.name Git - phdru.name/cgi-bin/blog-ru/search-tags.git/commitdiff
Fix a bug: pull from origin because cgi isn't bare
authorOleg Broytman <phd@phdru.name>
Tue, 20 May 2014 06:25:30 +0000 (10:25 +0400)
committerOleg Broytman <phd@phdru.name>
Tue, 20 May 2014 06:25:30 +0000 (10:25 +0400)
Pull from origin in cgi because it's checked out directory.

update

diff --git a/update b/update
index b6a83ed34d5e4d0d79b9a9faf89353a651e69444..e1b9b1b9749a37dd7168c6127c72f05c17c69996 100755 (executable)
--- a/update
+++ b/update
@@ -20,9 +20,6 @@ git pull --ff-only current master &&
 web="`git config --get --path remote.web.url`" &&
 [ -n "$web" ] && git push web
 
-cgi="`git config --get --path remote.cgi.url`" &&
-[ -n "$cgi" ] && git push cgi
-
 # Copy templates and generated files with timestamps to avoid rebuilding
 rsync -ahP "$current"/html/html.py "$current"/html/html.tmpl \
            "$current"/html/redirect.py "$current"/html/redirect.tmpl html &&
@@ -30,4 +27,7 @@ rsync -ahP "$current"/html/html.py "$current"/html/html.tmpl \
 # Save files generated by yacc
 rsync -ahP "$current"/parser.out "$current"/parsetab.py . &&
 
-cd "$current" && exec git pull origin
+cd "$current" && git pull origin &&
+
+cgi="`git config --get --path remote.cgi.url`" &&
+[ -n "$cgi" ] && cd "$cgi" && exec git pull origin