git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marcin Owsiany <marcin@owsiany.pl>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Eric Wong <normalperson@yhbt.net>
Subject: Re: [PATCH/RFC] git-svn: don't create master if another head exists
Date: Mon, 25 Jun 2012 08:57:26 +0100	[thread overview]
Message-ID: <20120625075726.GO3125@beczulka> (raw)
In-Reply-To: <7v4nq0hrjb.fsf@alter.siamese.dyndns.org>

On Sun, Jun 24, 2012 at 10:47:04PM -0700, Junio C Hamano wrote:
> Marcin Owsiany <marcin@owsiany.pl> writes:
> 
> > diff --git a/git-svn.perl b/git-svn.perl
> > index 0b074c4..90f3d06 100755
> > --- a/git-svn.perl
> > +++ b/git-svn.perl
> > @@ -1613,6 +1613,8 @@ sub post_fetch_checkout {
> >  	}
> >  
> >  	my $valid_head = verify_ref('HEAD^0');
> > +	my @heads_commits = eval { command(qw(show-ref --heads --hash)) };
> > +	return if $valid_head and grep { $_ eq $valid_head } @heads_commits;
> >  	command_noisy(qw(update-ref refs/heads/master), $gs->refname);
> >  	return if ($valid_head || !verify_ref('HEAD^0'));
> 
> This looks like a typical XY solution.

Can you please explain wha an "XY solution" is? I'm not familiar with
this expression.

>  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.

>  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
:-)

-- 
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

  reply	other threads:[~2012-06-25  8:05 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-24 22:08 [PATCH/RFC] git-svn: don't create master if another head exists Marcin Owsiany
2012-06-25  4:16 ` Eric Wong
2012-06-25  6:01   ` Junio C Hamano
2012-06-25  7:41   ` Marcin Owsiany
2012-06-25  5:44 ` Junio C Hamano
2012-06-25  7:53   ` Marcin Owsiany
2012-06-25  5:47 ` Junio C Hamano
2012-06-25  7:57   ` Marcin Owsiany [this message]
2012-06-25 17:01     ` Junio C Hamano
2012-06-26 21:21       ` Marcin Owsiany
2012-06-26 22:03         ` Junio C Hamano
2012-06-26 22:32           ` Marcin Owsiany
2012-07-09 22:03             ` Marcin Owsiany
2012-07-09 22:43               ` Junio C Hamano
2012-07-11  1:26                 ` Eric Wong
2012-07-11 21:40                   ` Marcin Owsiany
2012-07-11 22:56                     ` Junio C Hamano
2012-07-18  7:49                       ` Marcin Owsiany
2012-07-18 11:27                         ` Eric Wong
2012-07-18 12:47                           ` Marcin Owsiany
2012-07-19  8:19                             ` Eric Wong
2012-07-19 17:20                               ` Junio C Hamano
2012-07-18 20:32                         ` Junio C Hamano

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=20120625075726.GO3125@beczulka \
    --to=marcin@owsiany.pl \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=normalperson@yhbt.net \
    /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.
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 NNTP newsgroup(s).