From owner-svn-src-user@FreeBSD.ORG  Mon Dec 10 14:02:40 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 664405F8;
 Mon, 10 Dec 2012 14:02:40 +0000 (UTC) (envelope-from uqs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4B21B8FC12;
 Mon, 10 Dec 2012 14:02:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAE2ec7027895;
 Mon, 10 Dec 2012 14:02:40 GMT (envelope-from uqs@svn.freebsd.org)
Received: (from uqs@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAE2e12027894;
 Mon, 10 Dec 2012 14:02:40 GMT (envelope-from uqs@svn.freebsd.org)
Message-Id: <201212101402.qBAE2e12027894@svn.freebsd.org>
From: Ulrich Spoerlein <uqs@FreeBSD.org>
Date: Mon, 10 Dec 2012 14:02:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r244084 - user/uqs/git_conv
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 14:02:40 -0000

Author: uqs
Date: Mon Dec 10 14:02:39 2012
New Revision: 244084
URL: http://svnweb.freebsd.org/changeset/base/244084

Log:
  Really abort the whole run when pushing to the remote repos fails (only github currently)

Modified:
  user/uqs/git_conv/git_conv

Modified: user/uqs/git_conv/git_conv
==============================================================================
--- user/uqs/git_conv/git_conv	Mon Dec 10 14:01:41 2012	(r244083)
+++ user/uqs/git_conv/git_conv	Mon Dec 10 14:02:39 2012	(r244084)
@@ -42,7 +42,7 @@ fi
 
 svn2git()
 {
-    local rules source target dest
+    local rules source target dest d
     rules=$1; shift
     source=$1; shift
     dest="$@"
@@ -64,16 +64,14 @@ svn2git()
     fi
 
     echo "Pushing $target to $dest"
-    cd $target && for d in $dest; do git push $d || break; done
-    if [ $? != 0 ]; then
-	echo "Error in pushing to $dest" >&2
-	exit 1
-    fi
+    cd $target && for d in $dest; do
+	git push $d || { echo "Error in pushing to $dest" >&2; exit 1; }
+    done
 }
 
 gitsvn()
 {
-    local target dest
+    local target dest d
     target=$1; shift
     dest="$@"
 
@@ -87,11 +85,9 @@ gitsvn()
     fi
 
     echo "Pushing $target to $dest"
-    for d in $dest; do git push $d || break; done
-    if [ $? != 0 ]; then
-	echo "Error in pushing to $dest" >&2
-	exit 1
-    fi
+    for d in $dest; do
+	git push $d || { echo "Error in pushing to $dest" >&2; exit 1; }
+    done
 }
 
 gitsvn src-head.git github