summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Grimm <koreth@midwinter.com>2007-11-29 19:54:39 (GMT)
committerEric Wong <normalperson@yhbt.net>2007-12-01 07:32:51 (GMT)
commitcec0d5a3bbde60db4589d8e84a36d0ade653472e (patch)
treeb440bb64dee595ce8974372d9efebf644c6ef846
parent2d8797921511b141a6d1b2f74f763f5e9197cc40 (diff)
downloadgit-cec0d5a3bbde60db4589d8e84a36d0ade653472e.zip
git-cec0d5a3bbde60db4589d8e84a36d0ade653472e.tar.gz
git-cec0d5a3bbde60db4589d8e84a36d0ade653472e.tar.bz2
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>
-rwxr-xr-xgit-svn.perl2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl
index 8dbaf2f..9f884eb 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);