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> In-Reply-To: <YKvHxSNqI4qoNYjQ@fc.opsec.eu> References: <202105231312.14NDCcOm011888@gitrepo.freebsd.org> <YKpV7BTZLLKx5RPQ@fc.opsec.eu> <CAJ9axoTuzmDELGBMfc1_yu2=i0X_1rL-zLrr%2BKbvSsjzPQd07w@mail.gmail.com> <YKvHxSNqI4qoNYjQ@fc.opsec.eu>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YKvz5gTl0aYiWGrS>