From: Eric Wong <e@80x24.org>
To: Joseph Mingrone <jrm@ftfl.ca>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>, git@vger.kernel.org
Subject: Re: git-svn authors file in repo (Author: xxx not defined in .gitauthors file)
Date: Fri, 20 Sep 2019 06:49:41 +0000 [thread overview]
Message-ID: <20190920064941.trlc3noyvgseid3m@dcvr> (raw)
In-Reply-To: <20190919231833.GA9363@szeder.dev>
SZEDER Gábor <szeder.dev@gmail.com> wrote:
> On Thu, Sep 19, 2019 at 11:34:21AM -0300, Joseph Mingrone wrote:
> > Hello,
> >
> > We maintain a .gitauthors file for git-svn. When a new committer is
> > added to our project, a new entry is added to the .gitauthors file,
> > but we sometimes see errors like this:
> >
> > % git -C /usr/ports svn rebase
> > M .gitauthors
> > r512146 = 0c1f924ca984d53333beabb909ea53afb856c44b (refs/remotes/origin/trunk)
> > M math/py-pystan/Makefile
> > r512147 = acc387d4c8f3ebf904010bccc5679be06b184a9d (refs/remotes/origin/trunk)
> > M deskutils/gworkspace-gwmetadata/Makefile
> > ...
> > ...
> > ...
> > r512184 = 442bd1025776d5e3171be8e497ef2056dc47ff06 (refs/remotes/origin/trunk)
> > M www/rubygem-passenger/Makefile
> > M www/rubygem-passenger/distinfo
> > D www/rubygem-passenger/files/patch-asio-libc++7
> > W: -empty_dir: head/www/rubygem-passenger/files/patch-asio-libc++7
> > r512185 = f1a1b447811ae84011288678136e185c83180b8e (refs/remotes/origin/trunk)
> > M astro/xearth/files/freebsd.committers.markers
> > Author: dmgk not defined in .gitauthors file
> >
> > The new committer, dmgk, was added to .gitauthors in svn commit r512146,
> > then later he committed to the repository for the first time in r512185.
> > It seems that if these two commits are included in the same `git svn
> > rebase`, the error above will occur.
> >
> > Is there a solution or workaround for this aside from each committer
> > having an updated .gitauthors before doing `git svn rebase`. It's seems
> > to be a chicken/egg issue; they first need the updated .gitauthors file,
> > but the way to get the updated .gitauthors files is to do `git svn
> > rebase`.
>
> I have no idea how 'git svn' works and what this '.gitauthors' file
> is, so no workarounds from me... But this seems to be similar to the
> issue with '.gitattributes' in core Git that was fixed recently:
>
> https://public-inbox.org/git/20190902223944.897504-3-sandals@crustytoothpaste.net/
>
> Perhaps 'git svn rebase' should do the same, i.e. look out for commits
> changing this '.gitauthors' file and re-read the file each time it is
> changed.
>
> Cc-ing Eric for git-svn know-how.
Yes it's a bug in git-svn that we don't reload the authorsfile.
A patch (and reviewers) would be welcome :>
Kinda surprised nobody reported it until now, or maybe I missed it.
prev parent reply other threads:[~2019-09-20 6:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-19 14:34 git-svn authors file in repo (Author: xxx not defined in .gitauthors file) Joseph Mingrone
2019-09-19 23:18 ` SZEDER Gábor
2019-09-20 6:49 ` Eric Wong [this message]
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=20190920064941.trlc3noyvgseid3m@dcvr \
--to=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=jrm@ftfl.ca \
--cc=szeder.dev@gmail.com \
/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).