Marcin Owsiany [off-list ref] writes:
quoted
What are you really trying
to validate? "HEAD" points at an existing branch and you do not
care what branch it is?
Yes. I think.
Why do you even care about the value of HEAD, i.e. the output from
"rev-parse HEAD", if that is the case? Wouldn't you rather be
reading from the output "symbolic-ref HEAD" to see if it points at
any branch?
quoted
HEAD may not even point at a valid branch
but can be detached as long as it happens to point at a commit that
is at the tip of some branch (hence building further commit on HEAD
will break the condition you are checking in the above code)?
The more questions you ask, the less I feel I know about how git works
:-)
On Mon, Jun 25, 2012 at 10:01:06AM -0700, Junio C Hamano wrote:
Marcin Owsiany [off-list ref] writes:
quoted
quoted
What are you really trying
to validate? "HEAD" points at an existing branch and you do not
care what branch it is?
Yes. I think.
Why do you even care about the value of HEAD, i.e. the output from
"rev-parse HEAD", if that is the case?
I don't!
Wouldn't you rather be
reading from the output "symbolic-ref HEAD" to see if it points at
any branch?
Sure, I was simply not aware of its existence.
However after actually trying this approach I have found out that when
post_fetch_checkout runs at initial "clone", HEAD points at
refs/heads/master, but refs/heads/master does not exist! So just
checking HEAD is not enough, I need to verify that it points to
something valid. How about this:
From: Marcin Owsiany <redacted>
Date: Sun, 24 Jun 2012 22:40:05 +0100
Subject: [PATCH] git-svn: don't create master if another head exists
git-svn insists on creating the "master" head (unless it exists) on every
"fetch". While it is useful that it gets created initially (users expect this
git convention), some users find it annoying that it gets recreated, especially
when they would like the git branch names to follow SVN repository branch
names. More background in
http://thread.gmane.org/gmane.comp.version-control.git/115030
Make git-svn skip the "master" creation if HEAD points at a valid head. This
means "master" does get created on initial "clone" but does not get recreated
once a user deletes it.
Signed-off-by: Marcin Owsiany <redacted>
---
git-svn.perl | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 0b074c4..2379a71 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1612,9 +1612,9 @@ sub post_fetch_checkout {
}
}
- my $valid_head = verify_ref('HEAD^0');
+ return if verify_ref('HEAD^0');
command_noisy(qw(update-ref refs/heads/master), $gs->refname);
- return if ($valid_head || !verify_ref('HEAD^0'));
+ return unless verify_ref('HEAD^0');
return if $ENV{GIT_DIR} !~ m#^(?:.*/)?\.git$#;
my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";--
1.7.7.3
--
Marcin Owsiany <marcin@owsiany.pl> http://marcin.owsiany.pl/
GnuPG: 2048R/02F946FC 35E9 1344 9F77 5F43 13DD 6423 DBF4 80C6 02F9 46FC
"Every program in development at MIT expands until it can read mail."
-- Unknown