From owner-svn-src-head@freebsd.org  Mon Aug  6 01:08:44 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8D7E51064E27;
 Mon,  6 Aug 2018 01:08:44 +0000 (UTC)
 (envelope-from bwidawsk@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 3F19D8058F;
 Mon,  6 Aug 2018 01:08:44 +0000 (UTC)
 (envelope-from bwidawsk@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A71425E20;
 Mon,  6 Aug 2018 01:08:44 +0000 (UTC)
 (envelope-from bwidawsk@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7618hZ8092372;
 Mon, 6 Aug 2018 01:08:43 GMT (envelope-from bwidawsk@FreeBSD.org)
Received: (from bwidawsk@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7618hFx092371;
 Mon, 6 Aug 2018 01:08:43 GMT (envelope-from bwidawsk@FreeBSD.org)
Message-Id: <201808060108.w7618hFx092371@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bwidawsk set sender to
 bwidawsk@FreeBSD.org using -f
From: Ben Widawsky <bwidawsk@FreeBSD.org>
Date: Mon, 6 Aug 2018 01:08:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r337365 - head/tools/tools/git
X-SVN-Group: head
X-SVN-Commit-Author: bwidawsk
X-SVN-Commit-Paths: head/tools/tools/git
X-SVN-Commit-Revision: 337365
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2018 01:08:44 -0000

Author: bwidawsk
Date: Mon Aug  6 01:08:43 2018
New Revision: 337365
URL: https://svnweb.freebsd.org/changeset/base/337365

Log:
  git-svn-init: Clarify branch creation commands
  
  Suggested by:	eadler
  Reviewed by:	eadler
  Approved by:	emaste (mentor)
  Differential Revision:	https://reviews.freebsd.org/D16593

Modified:
  head/tools/tools/git/git-svn-init   (contents, props changed)

Modified: head/tools/tools/git/git-svn-init
==============================================================================
--- head/tools/tools/git/git-svn-init	Sun Aug  5 22:24:38 2018	(r337364)
+++ head/tools/tools/git/git-svn-init	Mon Aug  6 01:08:43 2018	(r337365)
@@ -119,11 +119,9 @@ git_checkout()
 	# Arrange to have 'master' reference 'trunk'
 	${GIT} checkout trunk
 
-	# Delete master
-	${GIT} branch -D master
-
-	# Make master really be trunk
-	${GIT} checkout -b master trunk
+	# Make master reference trunk
+	${GIT} branch --force master trunk
+	${GIT} checkout master
 }
 
 rebase()