From nobody Mon May 24 18:43:50 2021
X-Original-To: git@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
	by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EE4099FDE8A
	for <git@mlmmj.nyi.freebsd.org>; Mon, 24 May 2021 18:43:53 +0000 (UTC)
	(envelope-from uqs@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (4096 bits) client-digest SHA256)
	(Client CN "smtp.freebsd.org", Issuer "R3" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4FpmMF4V07z3t5n;
	Mon, 24 May 2021 18:43:53 +0000 (UTC)
	(envelope-from uqs@freebsd.org)
Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(Client did not present a certificate)
	(Authenticated sender: uqs/mail)
	by smtp.freebsd.org (Postfix) with ESMTPSA id 262ED9335;
	Mon, 24 May 2021 18:43:53 +0000 (UTC)
	(envelope-from uqs@freebsd.org)
Date: Mon, 24 May 2021 20:43:50 +0200
From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@freebsd.org>
To: Kurt Jaeger <pi@freebsd.org>
Cc: git@freebsd.org
Subject: Re: commit to gitrepo-dev ends up in gitrepo.FreeBSD.org ?
Message-ID: <YKvz5gTl0aYiWGrS@acme.spoerlein.net>
References: <202105231312.14NDCcOm011888@gitrepo.freebsd.org>
 <YKpV7BTZLLKx5RPQ@fc.opsec.eu>
 <CAJ9axoTuzmDELGBMfc1_yu2=i0X_1rL-zLrr+KbvSsjzPQd07w@mail.gmail.com>
 <YKvHxSNqI4qoNYjQ@fc.opsec.eu>
List-Id: Discussion of git use in the FreeBSD project <freebsd-git.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/freebsd-git
List-Help: <mailto:freebsd-git+help@freebsd.org>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Subscribe: <mailto:freebsd-git+subscribe@freebsd.org>
List-Unsubscribe: <mailto:freebsd-git+unsubscribe@freebsd.org>
Sender: owner-freebsd-git@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline
In-Reply-To: <YKvHxSNqI4qoNYjQ@fc.opsec.eu>
User-Agent: Mutt/2.0.6 (2021-03-06)
X-Spam: Yes

On Mon, 2021-05-24 at 17:35:33 +0200, Kurt Jaeger wrote:
>Hi!
>
>> > This is *really* strange.
>> >
>> > I've tried to test-commit to the test repo using
>> >
>> >   git push git@gitrepo-dev.FreeBSD.org:ports.git
>> >
>> > and it ended up in the production repo somehow ?
>
>> Looks like you set up the remotes badly maybe? Please paste in your
>> .git/config
>
>Here's .gitconfig.
>
>-------------
>
># This is Git's per-user configuration file.
>
>[includeIf "gitdir:~/git/"]
>	path = ~/.git-github
>
>[includeIf "gitdir:~/g/"]
>	path = ~/.git-fbsd
>
>[includeIf "gitdir:~/tg/"]
>	path = ~/.git-fbsd
>
>[includeIf "gitdir:~/h/"]
>	path = ~/.git-fbsd
>
>[includeIf "gitdir:/pou/ports/default/"]
>	path = ~/.git-fbsd
>
>[init]
>    defaultBranch = main
>
>[pager]
>    diff = false
>    show = false
>
>[color]
>    ui = off
>
>----------------
>
>The directory-specifics are just different email values, e.g. .git-fbsd:
>
>----------------
>[user]
>        name = Kurt Jaeger
>        email = pi@FreeBSD.org
>
>----------------

I don't know what this is, but this is clearly not the .git/config file 
that's inside your repository that has the odd remote behavior.

It looks something like this (and I assume you have mixed up a remote 
name and the URL it should point to):

% cat .git/config
[core]
         repositoryformatversion = 0
         filemode = true
         bare = false
         logallrefupdates = true
         hooksPath = .hooks
[remote "origin"]
         url = https://git.freebsd.org/ports.git
         fetch = +refs/heads/*:refs/remotes/origin/*
[branch "main"]
         remote = origin
         merge = refs/heads/main
[remote "github"]
         url = git@github.com:freebsd/freebsd-ports.git
         fetch = +refs/heads/*:refs/remotes/github/*
[remote "freebsd"]
         url = ssh://git@repo.freebsd.org/ports.git
         fetch = +refs/heads/*:refs/remotes/freebsd/*

hth
Uli