tgit reset fix - gitzone - git-based zone management tool for static and dynamic domains
HTML git clone https://git.parazyd.org/gitzone
DIR Log
DIR Files
DIR Refs
---
DIR commit 3b8fc938053f61d2ea4c7d870387264eb0bccb8f
DIR parent db5e0f36c48f9ac1a5a640b02c6143497cea5e56
HTML Author: tg(x) <*@tg-x.net>
Date: Sat, 5 Feb 2011 17:39:56 +0100
git reset fix
Diffstat:
M bin/gitzone | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
DIR diff --git a/bin/gitzone b/bin/gitzone
t@@ -164,12 +164,12 @@ sub install_zones {
my $cwd = cwd;
# move master to new
git 'checkout -f master';
- git 'reset --hard remotes/origin/new';
+ git 'reset --hard new';
chdir "$zone_dir/$user" or die $!;
git "clone $cwd ." unless -d '.git';
- git 'reset --hard';
- git 'pull';
+ git 'fetch';
+ git 'reset --hard remotes/origin/master';
for my $f (@zones) {
my $zone = basename $f;