From: Oleg Broytman <phd@phdru.name>
Date: Tue, 20 May 2014 06:25:30 +0000 (+0400)
Subject: Fix a bug: pull from origin because cgi isn't bare
X-Git-Tag: v0.1~8
X-Git-Url: https://git.phdru.name/?p=phdru.name%2Fcgi-bin%2Fblog-ru%2Fsearch-tags.git;a=commitdiff_plain;h=02a65d64e190bc5480cc4ccce4cc4e16db1ba66e

Fix a bug: pull from origin because cgi isn't bare

Pull from origin in cgi because it's checked out directory.
---

diff --git a/update b/update
index b6a83ed..e1b9b1b 100755
--- 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