]> rtime.felk.cvut.cz Git - git.git/commitdiff
git-svn: Don't create a "master" branch every time rebase is run
authorSteven Grimm <koreth@midwinter.com>
Thu, 29 Nov 2007 19:54:39 +0000 (11:54 -0800)
committerEric Wong <normalperson@yhbt.net>
Sat, 1 Dec 2007 07:32:51 +0000 (23:32 -0800)
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>
git-svn.perl

index 8dbaf2f33c577749f8267279462e0d5493847120..9f884eb2132c76b86475b97256e0ed565f84bb2e 100755 (executable)
@@ -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);