From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.161]) by sourceware.org (Postfix) with ESMTPS id 9D7BC3858D35 for ; Mon, 19 Feb 2024 14:55:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9D7BC3858D35 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gjlay.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=gjlay.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9D7BC3858D35 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=81.169.146.161 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1708354528; cv=pass; b=hY1H2+hwMJQGEGOUcRa91IjVw18CekGD9MyAMxTOCJuGiuB6icsC0ALmLGHK+2YG7RfGd0IuUOusv939Pbu5a76qpsJwpEv/RF1+j+kiJZN8cmOpr1Kowut6i7CfTdPPBHxP+VZaMkrVrGx5gMRZRrty5FnUpzlbeCxmca8iHUI= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1708354528; c=relaxed/simple; bh=7CE87yyOnlSyZNwXSmcN4eg+Pzk8RbJbITst9T+B5qA=; h=DKIM-Signature:DKIM-Signature:Message-ID:Date:MIME-Version: Subject:To:From; b=ABzMNxPO3NKycplub4mCL5Fek6+AnBKwP5zXq5ddJRJZ7K2Uw+DUdCGLCtLVVjhAa+cHCDnyi3QDl6KLEXGL0sgnClM8kPUDFYxJP00CPyzv632bBOffcP2Fb2pw6wuEVTWQs1+68Mp/4u2ct1kPha5FyY5zhI+X5uxO3Wtgyyk= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; t=1708354523; cv=none; d=strato.com; s=strato-dkim-0002; b=qCbCCe13HvKgh2LsWGVK1NhINEFBRviMG9Xaulyj/ffQECi0xBgHifKoEcbZg7OaG+ Un3R2AX5O6X1p7VaM1mDwDb27awyvthvBaS9Qr28mXgg0AYWK2RaWRbOJ5Aocc+ee25L YTOs/IX/Pdnzc0m2bHqurXytbyQZfvpVHU35jWbrO8f6idoV+1ADtAuB6zjyN39arHaG l3OK3ajOF89amtstzieXkzcBBgoz3k5sNMiiio+JbdZkbMQm8WxmsbL7aDHRKZ22l500 IkG2qsLVRq+6hBqyfQXDSVsSsHX/eDUs7PkDwrU4nmWK0dFQGIr2KeBeWG20Vph+9DhK YRLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1708354523; s=strato-dkim-0002; d=strato.com; h=In-Reply-To:Cc:From:References:To:Subject:Date:Message-ID:Cc:Date: From:Subject:Sender; bh=3l9PUL75bPYpNiKH+vIEn+P0iRtoVZW3ne8upGlult4=; b=j6Dfk2NUkJuxAfDTKIy41cKiLisU8BoHTj+RnDC3J+QrRggDRsLnZqmhkY8RpLSa/2 CqDEjngSfPpjVNTKLNV8baIygi7PSW43vIWXTU/P6GH0IV6iQClP5y+tJAurGrsBs56f L2zzBWGgStE8oIFJOTxAQsUevIHh5IfErtk0dsRfwax+Mf9i81rm5q5kqO1IVHkAChl1 EUt4oKkb6bIolcO14K/n1r9AKRMG9ga2mPKXTphbC3nDN1DaCZIiyJaVmmkKIz03xF9v T7UYIrv7aZmETlr+SgIFunWKVrhlWln6Ur4CSwjKqpqctaXaa8Hz5GcTp4N6+kx2ENY8 QN0A== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1708354522; s=strato-dkim-0002; d=gjlay.de; h=In-Reply-To:Cc:From:References:To:Subject:Date:Message-ID:Cc:Date: From:Subject:Sender; bh=3l9PUL75bPYpNiKH+vIEn+P0iRtoVZW3ne8upGlult4=; b=QLcC8BFkNYsl2jVMEjZWPzfwYmLipR/tJs8W463cU5Cfo4PpLQ0hePV6vKZDHKRpKl VcugDYZlpDcPnAtwCrme3U5ivrYWgthBGgkDuujeqhXTDOn5eU5OfWWFSzIkX6nkp5eF /lClhSz9bvzOBtb7MKNa+A/SgVUpNOnGFLcDG9IIBwh68t9JSkKAxHHJ0mvoNClQX0jH mvJeDiLkODl1XGYJyc6oOJwH7RpkkfRYiz5Udi1poaiojpcwryxTeD6SPZ+7yPdaGcau VoKSm3JQw9C0MGd/RR112eW4XTWct4cxGdiAiZJUCem1DheCOfQX4xGf5fGYo6wHnLoo 2a1A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1708354522; s=strato-dkim-0003; d=gjlay.de; h=In-Reply-To:Cc:From:References:To:Subject:Date:Message-ID:Cc:Date: From:Subject:Sender; bh=3l9PUL75bPYpNiKH+vIEn+P0iRtoVZW3ne8upGlult4=; b=+oiAA5ZD0kGB9zkldxOXzlVSy8zuQgeCUAQNagG6JS/envHuhw825S0PZvFGETdY9F t13S3nRF7iFHRB6F+RDw== X-RZG-AUTH: ":LXoWVUeid/7A29J/hMvvT3koxZnKT7Qq0xotTetVnKkSgcSjpmy9KwoMJ/K0VA==" Received: from [192.168.2.102] by smtp.strato.de (RZmta 49.11.2 DYNA|AUTH) with ESMTPSA id Lb68c601JEtMVtQ (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 19 Feb 2024 15:55:22 +0100 (CET) Message-ID: <597b0dae-c9bf-47e3-92b4-7cec14191a79@gjlay.de> Date: Mon, 19 Feb 2024 15:55:21 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: gcc: Trouble setting up / using git area Content-Language: en-US To: Mark Wielaard , overseers@gcc.gnu.org References: <4df83178-16b9-4c62-83d8-43d1111a7bb2@gjlay.de> <2bbf71cc-6b62-46bc-aa9b-3d062d7d7594@gjlay.de> From: Georg-Johann Lay Cc: avr@gjlay.de In-Reply-To: <2bbf71cc-6b62-46bc-aa9b-3d062d7d7594@gjlay.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,BODY_8BITS,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,KAM_LOTSOFHASH,KAM_SHORT,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Am 19.02.24 um 15:24 schrieb Georg-Johann Lay: > > > Am 19.02.24 um 14:36 schrieb Mark Wielaard: >> Hi Johann, >> >> On Mon, 2024-02-19 at 14:05 +0100, Georg-Johann Lay via Overseers >> wrote: >>> Hi, I'm having trouble wrapping my head around the >>> git areas as described in >>> >>> https://gcc.gnu.org/git.html "Repository Layout" >>> >>> With that description I managed somehow to get >>> >>> $ git ls-remote | grep gjl >>>   From git+ssh://gjl@gcc.gnu.org/git/gcc.git >>> eafe83f2f20ef0c1e7703c361ba314b44574523c    refs/users/gjl/heads/gcc-8 >>> >>> So I have my own branches in "users/gjl" according to the >>> branch naming convention. >>> >>> But I cannot use it to push anything. I created a local branch >>> "gjl/gcc-8" from "releases/gcc-8" and want to push, e.g. >>> >>> $ git push origin gjl/gcc-8:refs/users/gjl/heads/gcc-8 >>> >>> but I am getting errors from the server. >>> >>> Creating a branch to track "users/gjl" does not work either: >>> >>> $ git checkout -b gjl/gcc-8 --track refs/users/gjl/heads/gcc >>> >>> I am just lost and trying around isn't any good.  Would >>> you please help me on how to uuse it?  The gcc Wiki on git >>> does not have any examples either. >> >> Could you show us what the server errors are that you are getting? >> >> Did you make sure git knows about the users refs you created? >> You should do something like: >> >>      git config --add remote.origin.fetch >> "+refs/users/gjl/heads/*:refs/remotes/origin/users/gjl/*" >>      git config --add remote.origin.fetch >> "+refs/users/gjl/tags/*:refs/tags/users/gjl/*" >>      git fetch origin > > Hi Mark, > > Yes, I did that according to the hint in "Repository Layout" > where I replaced "dead" by "users/gjl/ > > My .git/config reads: > > [remote "origin"] >     url = git+ssh://gjl@gcc.gnu.org/git/gcc.git >     fetch = +refs/heads/master:refs/remotes/origin/master >     fetch = +refs/users/gjl/heads/*:refs/remotes/origin/users/gjl/* >     fetch = +refs/users/gjl/tags/*:refs/tags/users/gjl/* > [branch "master"] >     remote = origin >     merge = refs/heads/master > > > What I did in the worktree is: > > $ git checkout -b gjl/gcc-8 > $ git push --set-upstream origin gjl/gcc-8:refs/users/gjl/heads/gcc-8 > > which passes ok. > > Then I add and commit changes to gjl/gcc-8: > > $ git log > > commit 900efd5c53f2738cfd136c70a32b26d182354f11 (HEAD -> gjl/gcc-8) > Author: Georg-Johann Lay > Date:   Mon Feb 19 13:31:08 2024 +0100 > ... > > commit eafe83f2f20ef0c1e7703c361ba314b44574523c (tag: > releases/gcc-8.5.0, origin/users/gjl/gcc-8, releases/gcc-8) > Author: Jakub Jelinek > Date:   Fri May 14 08:22:23 2021 +0000 > ... > > Then I want to push that: > > $ git push origin HEAD > Enumerating objects: 16, done. > Counting objects: 100% (16/16), done. > Delta compression using up to 2 threads > Compressing objects: 100% (9/9), done. > Writing objects: 100% (9/9), 1.79 KiB | 1.79 MiB/s, done. > Total 9 (delta 7), reused 0 (delta 0), pack-reused 0 > remote: *** Update rejected by this repository's hooks.update-hook script > remote: *** (/git/gcc.git/hooks-bin/update_hook): > remote: *** Shared development branches should be named devel/*, and > should be documented in https://gcc.gnu.org/git.html . > remote: error: hook declined to update refs/heads/gjl/gcc-8 > To git+ssh://gcc.gnu.org/git/gcc.git >  ! [remote rejected]         HEAD -> gjl/gcc-8 (hook declined) > error: failed to push some refs to 'git+ssh://gcc.gnu.org/git/gcc.git' > > As far as I can see, the naming convention for my "users/gjl" area fits > the ones of other users: > > $ git ls-remote | grep users | grep -C2 gjl > From git+ssh://gjl@gcc.gnu.org/git/gcc.git > 71fee3df121affc891ada03b09e74e96b2ee5e5b > refs/users/giulianob/heads/pfe_backport_clean > a97db5c54aa2998507a0436cb10d76ae5854a0a1 > refs/users/giulianob/heads/pfe_backport_dirty > eafe83f2f20ef0c1e7703c361ba314b44574523c    refs/users/gjl/heads/gcc-8 > 437c1c2d91cee27c8280542e7a56d98470fd47cd    refs/users/glisse/heads/fenv > ce08a33145e1b5736595c4c5a600ea5443103d03 > refs/users/guojiufu/heads/guojiufu-branch > > But the error says: "hook declined to update refs/heads/gjl/gcc-8" > where the location should be refs/users/gjl/heads/gcc-8 > > Something with the tracking mapping appears to be not as expected; > the fetch entries in .git/config should do the trick, no? > > Johann Hi, just by pure trial and error, I found that the following works: $ git push origin users/gjl/gcc-8:refs/users/gjl/heads/gcc-8 So maybe there is a rule for "push" missing, similar to the rules for "fetch"? Johann