pull-usrlocalsrc: pull from source, push to origin

[git-scripts.git] / publish2web

diff --git a/publish2web b/publish2web
index 35faf015e344fa253047c44e6316d34c75fa3168..1847f7a8a4d66db22c3ea977dc69f8fe397dbd52 100755 (executable)
--- a/publish2web
+++ b/publish2web
@@ -15,7 +15,7 @@ fi &&
 
 cd "$HOME"/tmp &&
 dest_dir="`basename \"$source_dir\"`".git &&
-git clone --mirror --config core.sharedRepository=0644 "$source_dir" "$dest_dir" &&
+git clone --bare --config core.sharedRepository=0644 "$source_dir" "$dest_dir" &&
 
 cd "$dest_dir" &&
 git gc --aggressive &&
@@ -26,7 +26,7 @@ cp -p "$HOME"/Internet/WWW/htdocs/git.phdru.name/phdru.name/phdru.name.git/git-d
 if [ "`cat \"$source_dir\"/.git/description`" = \
    "Unnamed repository; edit this file 'description' to name the repository." ]
 then
-   "${VISUAL:-${EDITOR:-vi}}" "$source_dir"/.git/description description
+   `git var GIT_EDITOR` "$source_dir"/.git/description description
 else
    cp -p "$source_dir"/.git/description . && chmod a+r description
 fi &&
@@ -48,4 +48,5 @@ cd "$source_dir" &&
 if [ -n "$directories" ]; then
    dest_dir="$directories/$dest_dir"
 fi &&
-exec git remote add --mirror=push web "$HOME"/Internet/WWW/htdocs/git.phdru.name/"$dest_dir"
+git remote add web "$HOME"/Internet/WWW/htdocs/git.phdru.name/"$dest_dir" &&
+exec git push --set-upstream web master