[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

git-migration: Changes to 'master'



 clone |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 75c06ace20520de03b672befc2f9b6adbd3b3514
Author: Thierry Reding <thierry@gilfi.de>
Date:   Thu Jan 4 17:02:41 2007 +0100

    Implement the git archive policy correctly.

diff --git a/clone b/clone
index e22f7b2..742b929 100755
--- a/clone
+++ b/clone
@@ -19,7 +19,7 @@ (
 			cat > "$debian.git/.git/remotes/origin" << EOF
 URL: ssh://git.debian.org/git/pkg-xorg/$debian.git
 Push: refs/heads/master:refs/heads/debian-unstable
-Push: refs/heads/upstream-master:refs/heads/upstream-master
+Push: refs/heads/upstream-unstable:refs/heads/upstream-unstable
 EOF
 
 			(
@@ -28,7 +28,10 @@ EOF
 				(
 					read b
 					while [ "x$b" != "x" ]; do
-						if [ "x$b" != "xmaster" ]; then
+						if [
+						     "x${b##upstream-}" != "x$b" -a
+						     "x$b" != "xmaster"
+						   ]; then
 							echo "Push: refs/heads/$b:refs/heads/svn-$b" \
 								>> .git/remotes/origin
 						fi
@@ -41,7 +44,7 @@ EOF
 			# create remote `upstream' branch
 			cat > "$debian.git/.git/remotes/upstream" << EOF
 URL: git://anongit.freedesktop.org/git/$upstream
-Pull: refs/heads/master:refs/heads/upstream-master
+Pull: refs/heads/master:refs/heads/upstream-unstable
 EOF
 
 			# fetch latest master head from upstream branch



Reply to: