* git-svn authors file in repo (Author: xxx not defined in .gitauthors file)
@ 2019-09-19 14:34 Joseph Mingrone
2019-09-19 23:18 ` SZEDER Gábor
0 siblings, 1 reply; 3+ messages in thread
From: Joseph Mingrone @ 2019-09-19 14:34 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 1563 bytes --]
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`.
Regards,
Joseph
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 979 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git-svn authors file in repo (Author: xxx not defined in .gitauthors file)
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
0 siblings, 1 reply; 3+ messages in thread
From: SZEDER Gábor @ 2019-09-19 23:18 UTC (permalink / raw)
To: Joseph Mingrone; +Cc: git, Eric Wong
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git-svn authors file in repo (Author: xxx not defined in .gitauthors file)
2019-09-19 23:18 ` SZEDER Gábor
@ 2019-09-20 6:49 ` Eric Wong
0 siblings, 0 replies; 3+ messages in thread
From: Eric Wong @ 2019-09-20 6:49 UTC (permalink / raw)
To: Joseph Mingrone; +Cc: SZEDER Gábor, git
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-09-20 6:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).