public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: "David Kågedal" <davidk@lysator•liu.se>
To: git@vger•kernel.org
Cc: Eric Wong <normalperson@yhbt•net>, Marcin Owsiany <porridge@debian•org>
Subject: Re: git-svn stubbornly re-creating branch "master"
Date: Fri, 03 Apr 2009 12:42:03 +0200	[thread overview]
Message-ID: <87eiwakohw.fsf@krank.kagedal.org> (raw)
In-Reply-To: 20090329222827.GA32199@dcvr.yhbt.net

Eric Wong <normalperson@yhbt•net> writes:

> Marcin Owsiany <porridge@debian•org> wrote:
>> Hello,
>> 
>> I created my git repository by cloning it with git-svn from an upstream SVN
>> repository. When I did that, a branch "master" was created. Afterwards I
>> renamed that branch to "upstream". However every time I "git-svn fetch", it
>> recreates the "master" branch, pointing it at the newest upstream commit.
>> 
>> Ideally, I'd like it to just forget about "master" and do the same to my
>> "upstream" branch. Is it possible?
>> 
>> If not, then is it at least possible to have it not recreate the "master"
>> branch? It clutters my view.
>
> "master" has been a git convention since the earliest days of git and
> it's less confusing to new users following documentation if it always
> exists (and a lot of users' first git experience is with git svn).
>
> Why not just use "master" as one of your branches?  It won't bite you.
> "git svn fetch" will never clobber your "master" if it already exists.

I also find this highly annoying. I use branch names that matches the
branches we use in svn. So when working on changes for the svn "foo"
branch, I have a git branch "foo" that is based on "svn/foo". And when
working on "bar" I use a "bar" branch and so on. A "master" branch has
no place in my workflow, and I keep deleteing it over and over again.

But mostly I just ignore it.

-- 
David Kågedal

  reply	other threads:[~2009-04-03 10:44 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-29 17:13 git-svn stubbornly re-creating branch "master" Marcin Owsiany
2009-03-29 19:52 ` Dmitry Potapov
2009-04-03 10:57   ` Mikael Magnusson
2009-06-06 10:55     ` Marcin Owsiany
2009-06-14 15:52       ` Marcin Owsiany
2009-06-14 17:33         ` Andreas Ericsson
2009-06-14 21:16           ` Marcin Owsiany
2009-03-29 22:28 ` Eric Wong
2009-04-03 10:42   ` David Kågedal [this message]
2009-04-03 12:26   ` Marcin Owsiany

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87eiwakohw.fsf@krank.kagedal.org \
    --to=davidk@lysator$(echo .)liu.se \
    --cc=git@vger$(echo .)kernel.org \
    --cc=normalperson@yhbt$(echo .)net \
    --cc=porridge@debian$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox