From: Steven Grimm <koreth@midwinter.com>
Date: Thu, 29 Nov 2007 19:54:39 +0000 (-0800)
Subject: git-svn: Don't create a "master" branch every time rebase is run
X-Git-Tag: v1.5.4-rc0~123
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cec0d5a3bbde60db4589d8e84a36d0ade653472e;p=git.git

git-svn: Don't create a "master" branch every time rebase is run

If you run "git-svn rebase" while sitting on a topic branch, there is
no need to create a "master" branch if one didn't exist already. The
branch was created implicitly by the automatic checkout after fetching,
which in the case of rebase isn't actually necessary anyway.

Signed-off-by: Steven Grimm <koreth@midwinter.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/git-svn.perl b/git-svn.perl
index 8dbaf2f33..9f884eb21 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -550,6 +550,8 @@ sub cmd_rebase {
 		exit 1;
 	}
 	unless ($_local) {
+		# rebase will checkout for us, so no need to do it explicitly
+		$_no_checkout = 'true';
 		$_fetch_all ? $gs->fetch_all : $gs->fetch;
 	}
 	command_noisy(rebase_cmd(), $gs->refname);