git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH/RFC] git-svn: don't create master if another head exists

From
EWEric Wong <normalperson@yhbt.net>
Date
Jun 25, 2012, 04:16 UTC
Message-ID
<20120625041659.GA5785@dcvr.yhbt.net>
In-Reply-To
<20120624220835.GA4762@beczulka>
Marcin Owsiany <marcin@owsiany.pl> wrote:
Show 10 quoted lines
> 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 there is another head ref pointing
> to the same place. This means "master" does get created on initial "clone" but
> does not get recreated once a user deletes it.

Sounds reasonable to me. Thanks for following up on this after all this time :)

Show 15 quoted lines
> Signed-off-by: Marcin Owsiany <marcin@owsiany.pl>
> ---
>  git-svn.perl |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> 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;

I (and I believe most git hackers) prefer C-style "&&" for boolean expressions:

	return if $valid_head && grep { $_ eq $valid_head } @heads_commits;
"and" is lower precedence and best reserved for control flow:
	-f $file and print "File: $file exists!\n";

There's no logical difference in this case, but "&&" is probably easier for C programmers to read.

I'll just swap "and" for "&&" and push unless there's any objection from you.

Previous: Marcin OwsianyNext: Junio C Hamano
Message 2 of 23 in “git-svn: don't create master if another head exists”
  1. git-svn: don't create master if another head existsMarcin Owsiany, Jun 24, 2012
  2. Eric WongJun 25, 2012
  3. Junio C HamanoJun 25, 2012
  4. Marcin OwsianyJun 25, 2012
  5. Junio C HamanoJun 25, 2012
  6. Marcin OwsianyJun 25, 2012
  7. Junio C HamanoJun 25, 2012
  8. Marcin OwsianyJun 25, 2012
  9. Junio C HamanoJun 25, 2012
  10. Marcin OwsianyJun 26, 2012
  11. Junio C HamanoJun 26, 2012
  12. Marcin OwsianyJun 26, 2012
  13. Marcin OwsianyJul 9, 2012
  14. Junio C HamanoJul 9, 2012
  15. Eric WongJul 11, 2012
  16. Marcin OwsianyJul 11, 2012
  17. Junio C HamanoJul 11, 2012
  18. Marcin OwsianyJul 18, 2012
  19. Eric WongJul 18, 2012
  20. Marcin OwsianyJul 18, 2012
  21. Eric WongJul 19, 2012
  22. Junio C HamanoJul 19, 2012
  23. Junio C HamanoJul 18, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.