From: Julien Moutinho <julm+burette@autogeree.net>
Date: Tue, 19 Feb 2013 21:31:58 +0000 (+0100)
Subject: Correction : rule_git_reset : remotes/master .
X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=commitdiff_plain;h=6dd8add65ae14c272df64a12f00a142314c0b2b1

Correction : rule_git_reset : remotes/master .
---

diff --git a/vm_host b/vm_host
index dfbaa51..b99086b 100755
--- a/vm_host
+++ b/vm_host
@@ -35,10 +35,10 @@ rule_git_config () {
 rule_git_reset () {
 	(
 	cd "$tool"
-	#git checkout -f -B master origin
+	#git checkout -f -B master remotes/master
 	# NOTE: pas de -B sous squeeze
 	git checkout HEAD'^' &&
-	git branch -f master origin &&
+	git branch -f master remotes/master &&
 	git checkout master
 	git clean -f -d -x
 	)
diff --git a/vm_hosted b/vm_hosted
index 8afa6b4..c87f309 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -32,7 +32,7 @@ rule_git_config () {
 rule_git_reset () {
 	(
 	cd "$tool"
-	git checkout -f -B master origin
+	git checkout -f -B master remotes/master
 	git clean -f -d -x
 	)
  }
diff --git a/vm_remote b/vm_remote
index 19ce8d4..20dc746 100755
--- a/vm_remote
+++ b/vm_remote
@@ -28,10 +28,10 @@ rule_git_config () { # DESCRIPTION: configure le .git local pour bien pousser
 	cd "$tool"
 	git remote rm host || true
 	git remote add host $vm_host:tool/vm
-	git config --replace remote.host.push HEAD:refs/heads/origin
+	git config --replace remote.host.push HEAD:refs/remotes/master
 	git remote rm hosted || true
 	git remote add hosted root@$vm_fqdn:tool/vm
-	git config --replace remote.hosted.push HEAD:refs/heads/origin
+	git config --replace remote.hosted.push HEAD:refs/remotes/master
 	)
  }
 rule_git_push () { # SYNTAX: {host|hosted} $git_push_options