From owner-svn-src-user@FreeBSD.ORG Mon Jan 19 16:33:59 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9DD84C09; Mon, 19 Jan 2015 16:33:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8A668632; Mon, 19 Jan 2015 16:33:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0JGXxXJ015483; Mon, 19 Jan 2015 16:33:59 GMT (envelope-from uqs@FreeBSD.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0JGXxA3015482; Mon, 19 Jan 2015 16:33:59 GMT (envelope-from uqs@FreeBSD.org) Message-Id: <201501191633.t0JGXxA3015482@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: uqs set sender to uqs@FreeBSD.org using -f From: Ulrich Spoerlein Date: Mon, 19 Jan 2015 16:33:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r277387 - 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.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2015 16:33:59 -0000 Author: uqs Date: Mon Jan 19 16:33:58 2015 New Revision: 277387 URL: https://svnweb.freebsd.org/changeset/base/277387 Log: Stop pushing to googlecode, it's too unreliable; use the ports' version of svn2git and shut up git 2.0 push warnings. Modified: user/uqs/git_conv/git_conv Modified: user/uqs/git_conv/git_conv ============================================================================== --- user/uqs/git_conv/git_conv Mon Jan 19 16:15:12 2015 (r277386) +++ user/uqs/git_conv/git_conv Mon Jan 19 16:33:58 2015 (r277387) @@ -4,6 +4,7 @@ # # Simple for svn2git repos, need to run against local paths, using rules files in ~git/*.rules # - First svn2git run will create target git repo, then +# - git config --global push.default matching # - git remote add github github.com:freebsd/freebsd.git # - git config --add remote.github.push '+refs/heads/master:refs/heads/master' # - git config --add remote.github.push '+refs/heads/stable/*:refs/heads/stable/*' @@ -19,6 +20,7 @@ # - git svn init -Thead -rewrite-root=svn+ssh://svn.freebsd.org/base file:///home/svn/base src-head.git # - cd src-head.git # - git svn fetch -r 0:1000 +# - git config --global push.default matching # - git remote add github github.com:freebsd/freebsd.git # - git config --add remote.github.push '+refs/remotes/trunk:refs/heads/svn_head' # - git svn rebase @@ -26,7 +28,7 @@ : ${BASE=/home/git} : ${RULES_DIR=${BASE}} -: ${SVN2GIT=${BASE}/svn2git/svn-all-fast-export} +: ${SVN2GIT=/usr/local/bin/svn2git} : ${SRC_REPO=/home/svn/base} : ${DOC_REPO=/home/svn/doc} @@ -128,7 +130,7 @@ esac case "$TYPE" in base) - svn2git $RULES_DIR/freebsd-base.rules ${SRC_REPO} github bitbucket googlecode + svn2git $RULES_DIR/freebsd-base.rules ${SRC_REPO} github bitbucket #googlecode ;; doc) svn2git $RULES_DIR/freebsd-doc.rules ${DOC_REPO} github