From 94b92b567ca26f367428bdabf5577a6b6958cb83 Mon Sep 17 00:00:00 2001
From: Ben Widawsky <bwidawsk@FreeBSD.org>
Date: Mon, 6 Aug 2018 01:08:43 +0000
Subject: [PATCH] git-svn-init: Clarify branch creation commands

Suggested by:	eadler
Reviewed by:	eadler
Approved by:	emaste (mentor)
Differential Revision:	https://reviews.freebsd.org/D16593
---
 tools/tools/git/git-svn-init | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/tools/git/git-svn-init b/tools/tools/git/git-svn-init
index 8b46dfc96ae8..ed941f54d91c 100755
--- a/tools/tools/git/git-svn-init
+++ b/tools/tools/git/git-svn-init
@@ -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()