* git svn should refuse to checkin .svn directories
@ 2008-04-18 11:46 Thomas Koch
2008-04-18 21:09 ` JM Ibanez
2008-04-19 18:49 ` Jānis Rūcis
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Koch @ 2008-04-18 11:46 UTC (permalink / raw)
To: Git Mailing List
As you might guess I just annoyed my collegues by (temporarily) destroying our
svn repo. Nobody could checkout anymore, because I accidently checked in
a .svn directory with git svn.
I'm lucky that I'm still allowed to use git svn to work on our svn repo...
Maybe you could add a warning or something else to avoid .svn directories to
be ever checked in via git svn.
I'm sure that there is also a config option somewhere to get .svn directories
ignored (also subdirs when adding the parent dir?). But this check should
really be a default setting to avoid other newcommers to get into trouble
because they gave git svn a try.
Cheers,
--
Thomas Koch, Software Developer
http://www.koch.ro
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git svn should refuse to checkin .svn directories
2008-04-18 11:46 git svn should refuse to checkin .svn directories Thomas Koch
@ 2008-04-18 21:09 ` JM Ibanez
2008-04-19 18:49 ` Jānis Rūcis
1 sibling, 0 replies; 3+ messages in thread
From: JM Ibanez @ 2008-04-18 21:09 UTC (permalink / raw)
To: thomas; +Cc: Git Mailing List
[-- Attachment #1: Type: text/plain, Size: 900 bytes --]
Thomas Koch <thomas@koch.ro> writes:
> As you might guess I just annoyed my collegues by (temporarily) destroying our
> svn repo. Nobody could checkout anymore, because I accidently checked in
> a .svn directory with git svn.
>
> I'm lucky that I'm still allowed to use git svn to work on our svn repo...
>
> Maybe you could add a warning or something else to avoid .svn directories to
> be ever checked in via git svn.
>
> I'm sure that there is also a config option somewhere to get .svn directories
> ignored (also subdirs when adding the parent dir?). But this check should
> really be a default setting to avoid other newcommers to get into trouble
> because they gave git svn a try.
Well, this isn't a patch to git-svn, but this may help those working
with upstream SVN repositories via git and git-svn. Add this as the
pre-commit hook in .git/hooks (make sure to make it executable).
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: pre-commit --]
[-- Type: text/x-sh, Size: 309 bytes --]
#!/bin/sh
#
# Used in a git repo interacting with an upstream SVN repo, this
# pre-commit hook will not allow a commit of any directory named .svn
if (git diff-index HEAD | cut -f2 | grep "^\(.*/\)*\.svn/" 2>&1 > /dev/null); then
echo "Cowardly refusing to commit an .svn directory"
exit 1
fi
[-- Attachment #3: Type: text/plain, Size: 136 bytes --]
--
JM Ibanez
Software Architect
Orange & Bronze Software Labs, Ltd. Co.
jm@orangeandbronze.com
http://software.orangeandbronze.com/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git svn should refuse to checkin .svn directories
2008-04-18 11:46 git svn should refuse to checkin .svn directories Thomas Koch
2008-04-18 21:09 ` JM Ibanez
@ 2008-04-19 18:49 ` Jānis Rūcis
1 sibling, 0 replies; 3+ messages in thread
From: Jānis Rūcis @ 2008-04-19 18:49 UTC (permalink / raw)
To: Thomas Koch; +Cc: Git Mailing List
Hi,
On Fri, Apr 18, 2008 at 01:46:50PM +0200, Thomas Koch wrote:
> I'm sure that there is also a config option somewhere to get .svn directories
> ignored (also subdirs when adding the parent dir?). But this check should
> really be a default setting to avoid other newcommers to get into trouble
> because they gave git svn a try.
Perhaps it would help if you clarified why there are .svn directories in
your working copy. They are neither required nor created by git-svn.
Jānis
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-04-19 18:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-04-18 11:46 git svn should refuse to checkin .svn directories Thomas Koch
2008-04-18 21:09 ` JM Ibanez
2008-04-19 18:49 ` Jānis Rūcis
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).