From nobody Mon May 24 13:49:12 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 25E719E6DCB for ; Mon, 24 May 2021 13:49:17 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FpdqJ0jxJz3hgN; Mon, 24 May 2021 13:49:15 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-wr1-f42.google.com with SMTP id x7so9008103wrt.12; Mon, 24 May 2021 06:49:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Vn2njHGdmWnEKoo+g+3nOvrNj63gRmLyaYEiPA4QP0g=; b=Iaayk2P0iUna88qDIyWb8m4A+FJshMLPC78c2L6pfoEv+DaIHpCoJSuazwafYpaPbc 2vOIAds5z8Zevbh8tqhEoNr5F93n1umiXHdd7eNT2nMmZg1dyHECFTc1oantVaTFJoq4 emLt3tjuMIU36O37ib92Vtaqrc0za3zTkGLse2kTTTLnJ8Lzg7WYRQHlyiCJ0iZd/Vz3 FCq+NvJAnZ8cf8/3s54qrnfC+Mx2XcEK6Pxpp87Il3DeMTmcOqCcQLHcpE4STiTd1viB IJ4JsdNBT2nE1tsAoVTspSOI4KjXMWVUjr2dir/1zwkQDyGGGRCbhmA7CKQ0vsVGOoOf QpIQ== X-Gm-Message-State: AOAM533xYJuoRz9dah72EKiYzUpV58zrtNkb0Yjsl/ov4gOBEPaTiDkm pTHEzLF0CVP7208vOkd4c27xjjkVpwMsDyDynSLDNcKWf0Y= X-Google-Smtp-Source: ABdhPJzgu2Rc9Fxz1xxzKZy4n5VAGaEzPmga1O1diLacaFZ6YQqI2QCtxOjhGPFz+1VWqI5cHzgDVY2cqgnkShSoQk4= X-Received: by 2002:a5d:5541:: with SMTP id g1mr22414262wrw.102.1621864154073; Mon, 24 May 2021 06:49:14 -0700 (PDT) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <202105231312.14NDCcOm011888@gitrepo.freebsd.org> In-Reply-To: From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Mon, 24 May 2021 15:49:12 +0200 Message-ID: Subject: Re: commit to gitrepo-dev ends up in gitrepo.FreeBSD.org ? To: Kurt Jaeger Cc: git@freebsd.org Content-Type: multipart/alternative; boundary="000000000000c70cf605c313ac21" X-Rspamd-Queue-Id: 4FpdqJ0jxJz3hgN X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [0.00 / 15.00]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.221.42:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; MIME_TRACE(0.00)[0:+,1:+,2:~]; DMARC_NA(0.00)[freebsd.org]; NEURAL_SPAM_SHORT(1.00)[1.000]; SPAMHAUS_ZRD(0.00)[209.85.221.42:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.42:from]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.42:from]; SUBJECT_ENDS_QUESTION(1.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; R_DKIM_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[uqs@freebsd.org,uspoerlein@gmail.com]; MAILMAN_DEST(0.00)[git] X-Spam: Yes --000000000000c70cf605c313ac21 Content-Type: text/plain; charset="UTF-8" On Sun, May 23, 2021 at 3:17 PM 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 --000000000000c70cf605c313ac21 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

On Sun, May 23, 2021 at 3:17 PM Kurt Jaeger <pi@freebsd.org> wrote:
Hi!

This is *really* strange.

I've tried to test-commit to the test repo using

=C2=A0 git push git@gitrepo-dev.FreeBSD.org:ports.git

and it ended up in the production repo somehow ?
=C2= =A0
Looks like you set up the remotes badly maybe? Please paste i= n your .git/config=C2=A0
--000000000000c70cf605c313ac21-- From nobody Mon May 24 15:35:33 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 CE9B49E99B3 for ; Mon, 24 May 2021 15:35:36 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from fc.opsec.eu (fc.opsec.eu [IPv6:2001:14f8:200:4::4]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FphB05bgtz3Hkv; Mon, 24 May 2021 15:35:36 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from pi by fc.opsec.eu with local (Exim 4.94.2 (FreeBSD)) (envelope-from ) id 1llCc9-0001Bl-Ko; Mon, 24 May 2021 17:35:33 +0200 Date: Mon, 24 May 2021 17:35:33 +0200 From: Kurt Jaeger To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: git@freebsd.org Subject: Re: commit to gitrepo-dev ends up in gitrepo.FreeBSD.org ? Message-ID: References: <202105231312.14NDCcOm011888@gitrepo.freebsd.org> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4FphB05bgtz3Hkv X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Spam: Yes 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 ---------------- -- pi@FreeBSD.org +49 171 3101372 Now what ? 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 ; 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?= To: Kurt Jaeger Cc: git@freebsd.org Subject: Re: commit to gitrepo-dev ends up in gitrepo.FreeBSD.org ? Message-ID: References: <202105231312.14NDCcOm011888@gitrepo.freebsd.org> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: 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 From nobody Mon May 24 18:45:46 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 EFC849FF548 for ; Mon, 24 May 2021 18:45:50 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from fc.opsec.eu (fc.opsec.eu [IPv6:2001:14f8:200:4::4]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FpmPV69GBz3tv3; Mon, 24 May 2021 18:45:50 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from pi by fc.opsec.eu with local (Exim 4.94.2 (FreeBSD)) (envelope-from ) id 1llFaE-0001O2-IE; Mon, 24 May 2021 20:45:46 +0200 Date: Mon, 24 May 2021 20:45:46 +0200 From: Kurt Jaeger To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: git@freebsd.org Subject: Re: commit to gitrepo-dev ends up in gitrepo.FreeBSD.org ? Message-ID: References: <202105231312.14NDCcOm011888@gitrepo.freebsd.org> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4FpmPV69GBz3tv3 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Spam: Yes Hi! > > > Looks like you set up the remotes badly maybe? Please paste in your > > > .git/config > > > > Here's .gitconfig. [...] > 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. Ah, I was not aware of that config file. Here it is: ---------------------- [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true hooksPath = .hooks [remote "freebsd"] fetch = +refs/notes/*:refs/notes/* url = ssh://git@gitrepo-dev.freebsd.org/ports.git fetch = +refs/heads/*:refs/remotes/freebsd/* [branch "main"] remote = freebsd merge = refs/heads/main ---------------------- -- pi@FreeBSD.org +49 171 3101372 Now what ? From nobody Mon May 24 19:00:51 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 4B19AA7FA2B for ; Mon, 24 May 2021 19:00:53 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4Fpmks0fmrz4TkG; Mon, 24 May 2021 19:00: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 784249B8E; Mon, 24 May 2021 19:00:52 +0000 (UTC) (envelope-from uqs@freebsd.org) Date: Mon, 24 May 2021 21:00:51 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Kurt Jaeger Cc: git@freebsd.org Subject: Re: commit to gitrepo-dev ends up in gitrepo.FreeBSD.org ? Message-ID: References: <202105231312.14NDCcOm011888@gitrepo.freebsd.org> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: User-Agent: Mutt/2.0.6 (2021-03-06) X-Spam: Yes On Mon, 2021-05-24 at 20:45:46 +0200, Kurt Jaeger wrote: >Hi! > >> > > Looks like you set up the remotes badly maybe? Please paste in your >> > > .git/config >> > >> > Here's .gitconfig. >[...] >> 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. > >Ah, I was not aware of that config file. > >Here it is: > >---------------------- >[core] > repositoryformatversion = 0 > filemode = true > bare = false > logallrefupdates = true > hooksPath = .hooks >[remote "freebsd"] > fetch = +refs/notes/*:refs/notes/* > url = ssh://git@gitrepo-dev.freebsd.org/ports.git > fetch = +refs/heads/*:refs/remotes/freebsd/* >[branch "main"] > remote = freebsd > merge = refs/heads/main >---------------------- Hmmm, that looks perfectly fine. Pushing to 'freebsd' in this repo should've gone to the dev cluster. Are you sure you don't also have a 2nd checkout and ran the command from there? Cheers Uli From nobody Mon May 24 19:23:49 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 013C19EA56C for ; Mon, 24 May 2021 19:23:52 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from fc.opsec.eu (fc.opsec.eu [IPv6:2001:14f8:200:4::4]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FpnFM54fNz4cZp; Mon, 24 May 2021 19:23:51 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from pi by fc.opsec.eu with local (Exim 4.94.2 (FreeBSD)) (envelope-from ) id 1llGB3-0001Qh-8d; Mon, 24 May 2021 21:23:49 +0200 Date: Mon, 24 May 2021 21:23:49 +0200 From: Kurt Jaeger To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: git@freebsd.org Subject: Re: commit to gitrepo-dev ends up in gitrepo.FreeBSD.org ? Message-ID: References: <202105231312.14NDCcOm011888@gitrepo.freebsd.org> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4FpnFM54fNz4cZp X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Spam: Yes Hi! > > Ah, I was not aware of that config file. [...] > Hmmm, that looks perfectly fine. Pushing to 'freebsd' in this repo > should've gone to the dev cluster. Are you sure you don't also have a 2nd > checkout and ran the command from there? I do have a 2nd checkout -- one to test the commit (the one in question) and one to really commit. I can not rule out that I made a mistake, but at the time of the commit I did thorouglhy check the directory I was in and concluded that this mishap did not happen. Thanks for analysing this and pointing me to .git/config, but I guess there's nothing more to analyse and find the real cause 8-( -- pi@FreeBSD.org +49 171 3101372 Now what ? From nobody Tue May 25 09:59:46 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 BF8959F4A58 for ; Tue, 25 May 2021 09:59:47 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4Fq8h355mHz4V8h; Tue, 25 May 2021 09:59:47 +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 402E620EDD; Tue, 25 May 2021 09:59:47 +0000 (UTC) (envelope-from uqs@freebsd.org) Date: Tue, 25 May 2021 11:59:46 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Kurt Jaeger Cc: git@freebsd.org Subject: Re: commit to gitrepo-dev ends up in gitrepo.FreeBSD.org ? Message-ID: References: <202105231312.14NDCcOm011888@gitrepo.freebsd.org> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: User-Agent: Mutt/2.0.6 (2021-03-06) X-Spam: Yes X-ThisMailContainsUnwantedMimeParts: N On Mon, 2021-05-24 at 21:23:49 +0200, Kurt Jaeger wrote: >Hi! > >> > Ah, I was not aware of that config file. >[...] >> Hmmm, that looks perfectly fine. Pushing to 'freebsd' in this repo >> should've gone to the dev cluster. Are you sure you don't also have a 2nd >> checkout and ran the command from there? > >I do have a 2nd checkout -- one to test the commit (the one >in question) and one to really commit. > >I can not rule out that I made a mistake, but at the time of >the commit I did thorouglhy check the directory I was in and >concluded that this mishap did not happen. > >Thanks for analysing this and pointing me to .git/config, but I >guess there's nothing more to analyse and find the real cause 8-( I would recommend to have a single checkout with multiple remotes, where say "freebsd" is a https read-only link to production and you have push-able remotes using ssh to dev and prod, called "dev" and "prod" so that you cannot accidentally push without specifying a remote. Typing "dev" or "prod" then is an explicit action. Cheers Uli