Bug 229409 - .gitauthors: fix cvs2svn
Summary: .gitauthors: fix cvs2svn
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Joseph Mingrone
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-06-29 15:05 UTC by Mathieu Arnold
Modified: 2018-07-02 11:00 UTC (History)
0 users

See Also:


Attachments
patch (488 bytes, patch)
2018-06-29 15:05 UTC, Mathieu Arnold
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Mathieu Arnold freebsd_committer freebsd_triage 2018-06-29 15:05:09 UTC
Created attachment 194727 [details]
patch

If you try to use the .gitauthors file with an empty repository, you get:

$ git svn fetch --authors-file ~/work/.gitauthors
fatal: name consists only of disallowed characters:
32768 at /usr/local/lib/perl5/site_perl/Git/SVN/Ra.pm line 476.

because the first commit is from cvs2svn, and it does not have a name.
Comment 1 Mathieu Arnold freebsd_committer freebsd_triage 2018-06-29 15:19:46 UTC
Then, r2276 fails because davidg does not have a name.
Comment 2 Joseph Mingrone freebsd_committer freebsd_triage 2018-06-29 16:00:06 UTC
I will go through the whole `git svn fetch` to catch all bad entries.  It might take a few days to make it through all ~ 473548 commits.
Comment 3 Joseph Mingrone freebsd_committer freebsd_triage 2018-06-29 18:32:15 UTC
Hmmm... I am seeing `git svn fetch` and `git log` skip over r2276 and r2277 without any error.  See the output of those two commands.  `svn log` does seem to show them as "special" commits, one a merge and one an artefact of the cvs to svn conversion.  I mention this just out of curiosity and for posterity.  I will still add David Greenman's name for his second account.

% git svn fetch --authors-file /usr/ports/.gitauthors
...
r2274 = 03a1f5a8c920d6581a5c005e3fd5adbef05f3087 (refs/remotes/origin/trunk)
        M       emulators/wine/Makefile
        M       emulators/wine-devel/Makefile
r2275 = a3ce667cec51863693e509c3f18bf499281296e5 (refs/remotes/origin/trunk)
        M       net/samba/Makefile
        M       net/samba/distinfo
        M       net/samba/files/patch-aa
        M       net/samba/pkg-plist
        M       net/samba-devel/Makefile
        M       net/samba-devel/distinfo
        M       net/samba-devel/files/patch-aa
        M       net/samba-devel/pkg-plist
        M       net/samba3/Makefile
        M       net/samba3/distinfo
        M       net/samba3/files/patch-aa
        M       net/samba3/pkg-plist
r2278 = a44da3ab8940963565fb271346ee697a1843bf6e (refs/remotes/origin/trunk)
        M       net/slirp/Makefile
r2279 = c648afe654130dd257a664bd9d2316009973177e (refs/remotes/origin/trunk)
        M       shells/zsh/pkg-plist
        M       shells/zsh-devel/pkg-plist
...

% git -C /usr/ports log --reverse
...
commit 08a28c096b7038b312665e00818b564bf14a7607
Author: Jeffrey Hsu <hsu@FreeBSD.org>
Date:   Thu Oct 5 20:50:32 1995 +0000

    Update to Wine1003.  Uses gnu configure instead of imake.


    git-svn-id: svn+ssh://svn.freebsd.org/ports/head@2275 aed309b6-a8cd-e111-996c-001c23d10e55

commit ebae9c35f558464562884fca21fd24ebf7037636
Author: Gary Palmer <gpalmer@FreeBSD.org>
Date:   Fri Oct 6 03:18:41 1995 +0000

    Update 1.9.13 to 1.9.14

    Submitted by:     Juergen Lock <nox@jelal.hb.north.de>


    git-svn-id: svn+ssh://svn.freebsd.org/ports/head@2278 aed309b6-a8cd-e111-996c-001c23d10e55

commit c8103bba71fb9b5d13a8a3852080b97e7bbe4b63
Author: Satoshi Asami <asami@FreeBSD.org>
Date:   Fri Oct 6 05:18:34 1995 +0000

    Change Alain's addresses per his request.
...

% svn log -r 2275:2279 ~/scm/freebsd/ports/
------------------------------------------------------------------------
r2275 | hsu | 1995-10-05 17:50:32 -0300 (Thu, 05 Oct 1995) | 2 lines

Update to Wine1003.  Uses gnu configure instead of imake.

------------------------------------------------------------------------
r2276 | davidg | 1995-10-05 17:58:10 -0300 (Thu, 05 Oct 1995) | 2 lines

Sync with main branch.

------------------------------------------------------------------------
r2277 | cvs2svn | 1995-10-05 17:58:11 -0300 (Thu, 05 Oct 1995) | 2 lines

This commit was manufactured by cvs2svn to create tag
'RELENG_2_1_0_RELEASE'.
------------------------------------------------------------------------
r2278 | gpalmer | 1995-10-06 00:18:41 -0300 (Fri, 06 Oct 1995) | 4 lines

Update 1.9.13 to 1.9.14

Submitted by:     Juergen Lock <nox@jelal.hb.north.de>

------------------------------------------------------------------------
r2279 | asami | 1995-10-06 02:18:34 -0300 (Fri, 06 Oct 1995) | 2 lines

Change Alain's addresses per his request.
Comment 4 Mathieu Arnold freebsd_committer freebsd_triage 2018-06-30 08:22:56 UTC
Oh, yes, my svn-remote is much more comprehensive than the default one:

[svn-remote "svn"]
        rewriteRoot = https://svn.freebsd.org/ports
        url = svn+ssh://repo.freebsd.org/ports
        pushurl = svn+ssh://repo.freebsd.org/ports
        fetch = head:refs/remotes/origin/trunk
        fetch = svnadmin:refs/remotes/origin/svnadmin
        branches = branches/*:refs/remotes/origin/*
        tags = tags/*:refs/remotes/origin/tags/*
Comment 5 Mathieu Arnold freebsd_committer freebsd_triage 2018-07-01 13:58:15 UTC
I think the idea is that name are required
Comment 6 commit-hook freebsd_committer freebsd_triage 2018-07-02 10:58:55 UTC
A commit references this bug:

Author: jrm
Date: Mon Jul  2 10:58:27 UTC 2018
New revision: 473726
URL: https://svnweb.freebsd.org/changeset/ports/473726

Log:
  .gitauthors: Ensure all accounts have a name

  Missing names will cause `git svn fetch --authors-file .gitauthors` to
  fail.

  PR:		229409
  Reported by:	mat

Changes:
  head/.gitauthors
Comment 7 Joseph Mingrone freebsd_committer freebsd_triage 2018-07-02 11:00:41 UTC
Committed.  Thanks.