From: Johan Herland <johan@herland.net>
To: Eric Wong <normalperson@yhbt.net>
Cc: Git mailing list <git@vger.kernel.org>,
Thomas Ferris Nicolaisen <tfnico@gmail.com>
Subject: Re: [RFC/PATCH] git svn: Set default --prefix='origin/' if --prefix is not given
Date: Tue, 1 Oct 2013 08:12:53 +0200 [thread overview]
Message-ID: <CALKQrgf0tBN9ymZ0Yq6iW95dwayhJC1a_9LZBagW6B_hBo5owA@mail.gmail.com> (raw)
In-Reply-To: <20131001040752.GA882@dcvr.yhbt.net>
On Tue, Oct 1, 2013 at 6:07 AM, Eric Wong <normalperson@yhbt.net> wrote:
> Johan Herland <johan@herland.net> wrote:
>> git-svn by default puts its Subversion-tracking refs directly in
>> refs/remotes/*. This runs counter to Git's convention of using
>> refs/remotes/$remote/* for storing remote-tracking branches.
>
>> Furthermore, combining git-svn with regular git remotes run the risk of
>> clobbering refs under refs/remotes (e.g. if you have a git remote
>> called "tags" with a "v1" branch, it will overlap with the git-svn's
>> tracking branch for the "v1" tag from Subversion.
>>
>> Even though the git-svn refs stored in refs/remotes/* are not "proper"
>> remote-tracking branches (since they are not covered by a proper git
>> remote's refspec), they clearly represent a similar concept, and would
>> benefit from following the same convention.
>
> I regretted my original naming shortly after introducing it (IIRC,
> git-svn was the first refs/remotes/* user). However, this risks
> breaking existing code and 3rd-party docs/tutorials.
True. Although the patch does not affect existing git-svn
configurations, it does affect all future (where the user does not
pass --prefix), and all documentation and scripts that will come to
work on those must be adjusted accordingly.
> How about we put a big warning of impending change in there for now and
> wait until git 1.9/2.0 to make the actual change?
Sounds sensible. What should the warning look like, and where should
it be placed? I'm thinking that if you run git svn init/clone without
--prefix, there should be a verbose warning explaining (a) the trouble
you're likely to encounter when using no prefix, and (b) the upcoming
change in default prefix. Obviuosly, there should be a corresponding
note in the git-svn manual page. Any other places in git.git that
warrants changing? Hopefully this should be sufficient to trigger
corresponding adjustments in third-party tools + docs ahead of the
actual change in 1.9/2.0.
> Thanks for bringing this up again!
Thanks for your comments!
...Johan
--
Johan Herland, <johan@herland.net>
www.herland.net
next prev parent reply other threads:[~2013-10-01 6:13 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-22 9:02 git-svn: Use prefix by default? Thomas Ferris Nicolaisen
2013-09-30 22:39 ` Johan Herland
2013-09-30 22:46 ` [RFC/PATCH] git svn: Set default --prefix='origin/' if --prefix is not given Johan Herland
2013-10-01 4:07 ` Eric Wong
2013-10-01 6:12 ` Johan Herland [this message]
2013-10-03 19:01 ` Eric Wong
2013-10-05 23:30 ` [RFC/PATCHv2 1/3] Documentation/git-svn: Promote the use of --prefix in docs + examples Johan Herland
2013-10-05 23:30 ` [RFC/PATCHv2 2/3] git-svn: Warn about changing default for --prefix in Git v2.0 Johan Herland
2013-10-09 1:34 ` Eric Sunshine
2013-10-09 12:18 ` Johan Herland
2013-10-05 23:30 ` [RFC/PATCHv2 3/3] Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given Johan Herland
2013-10-06 9:51 ` [RFC/PATCHv2 1/3] Documentation/git-svn: Promote the use of --prefix in docs + examples Philip Oakley
2013-10-06 13:46 ` Johan Herland
2013-10-09 1:33 ` Eric Sunshine
2013-10-09 12:06 ` Johan Herland
2013-10-11 12:57 ` [RFC/PATCHv3 0/3] Change git-svn's default --prefix in Git v2.0 Johan Herland
2013-10-11 12:57 ` [RFC/PATCHv3 1/3] Documentation/git-svn: Promote the use of --prefix in docs + examples Johan Herland
2013-10-11 12:57 ` [RFC/PATCHv3 2/3] git-svn: Warn about changing default for --prefix in Git v2.0 Johan Herland
2013-10-12 22:33 ` Eric Wong
2013-10-11 12:57 ` [RFC/PATCHv3 3/3] Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given Johan Herland
2014-04-19 8:32 ` Eric Wong
2014-04-19 9:10 ` [PATCH] git-svn.txt: Retain a description og pre-v2.0 default prefix Johan Herland
2014-04-19 11:43 ` Eric Wong
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CALKQrgf0tBN9ymZ0Yq6iW95dwayhJC1a_9LZBagW6B_hBo5owA@mail.gmail.com \
--to=johan@herland.net \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
--cc=tfnico@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).