Date: Mon, 3 May 2021 11:34:56 +0000 From: Rene Ladan <rene@freebsd.org> To: Matthias Fechner <mfechner@freebsd.org> Cc: freebsd-git@freebsd.org Subject: Re: Script rmport shows error message Message-ID: <YI/f4DbKHRzsPTu1@freefall.freebsd.org> In-Reply-To: <add7f2ac-9e0f-7662-3519-40dde83890ad@freebsd.org> References: <8613e467-9408-527f-d8f0-81a6db0bdce9@freebsd.org> <YI2NMrAq1PUXZwA8@freefall.freebsd.org> <add7f2ac-9e0f-7662-3519-40dde83890ad@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, May 03, 2021 at 10:37:15AM +0200, Matthias Fechner wrote:
> Am 01.05.2021 um 19:17 schrieb Rene Ladan:
> > It might indeed be because you have a remote it does not expect:
> >
> > if ! ${GIT} diff --exit-code remotes/origin/main ; then
> > ...
> > fi
> >
> > Here I have:
> > % git remote -v
> > origin https://git.freebsd.org/ports.git (fetch)
> > origin git@gitrepo.FreeBSD.org:ports.git (push)
>
> I think this should be fixed in the script, as the documentation here:
> https://docs.freebsd.org/en/articles/committers-guide/
>
> is using the remote alias freebsd and not origin which I think was a
> very decision.
>
> I modified the script now locally (in a tmp folder) and removed the
> obsolete ports.
This sounds like something upstreamable.
> I also saw a problem with the question if I would like to tweak the
> commit message.
> I told there y but it just had not shown me the commit message to modify it.
>
> I had to manually do a:
> git commit --amend
Yes, the flow is somehow broken if you choose yes but I don't see why.
René
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YI/f4DbKHRzsPTu1>