threads / patch / 11061

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

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

## tl;dr

One message between Nov 29, 2007 and Nov 29, 2007. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Steven Grimm· Nov 29, 2007, 19:54 UTC · lore

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>
---
 git-svn.perl |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Show changes to git-svn.perl +2 −0
diff --git a/git-svn.perl b/git-svn.perl
index 43e1591..d483e6b 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -545,6 +545,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);
-- 
1.5.3.6.960.g49661

← back to recent threads