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 [85.215.255.22]) by sourceware.org (Postfix) with ESMTPS id 855113858D1E for ; Mon, 19 Feb 2024 14:24:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 855113858D1E 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 855113858D1E Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=85.215.255.22 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1708352672; cv=pass; b=kK7sZgLg/W3/MRjwztAAck81/M1HafHVTJoviKzJ6zS3Mo0LkTbI5wMwDuBCuOM8GfgxloVM6ms32ZaK+gyUKKu6TYTgz1FzFMazjxFea1evw7PGlRSpNjmH4cDBncvYjFYDH34/sCtSG4npdpQNl5HSeQcJUEk3Gx1dnQLeczc= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1708352672; c=relaxed/simple; bh=LjGigwG4DceJroA1IT2CSMqGGxcERBhrLz5pXffb0CA=; h=DKIM-Signature:DKIM-Signature:Message-ID:Date:MIME-Version: Subject:To:From; b=ou7IJggX0+lu3M8Fr/6gQXjmF7xf0JwncRlYiZGoQtXTd+gY34fMqlQNwGC92p/3u21Z/4P7wuGegufF4hvK0SYzFV0SMNSJ+yDduPCwRo1sPUeA8owbBj8+XsoeSh0t6F12/BU0XdV0EVGo42K3POGfIJit1pYUbMuy1j2OyGs= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; t=1708352668; cv=none; d=strato.com; s=strato-dkim-0002; b=SMpqL5u3/2tDisUpkDic8IERYjU7U5k7PAFbbzzdZk6rFXgRrAbUgv5mGDuxDl2R2M lQRT8gh54S9AHxvMqa65Iz4+asNPXU0INIUH3gYaoAz3fiIaZti8NH+761NpbwzyELIh Vsh7hSnLXqhiersHxidZi91DxTbqUncfysAZMr/8L+xiB3DzdTabMh18bz3F7/m8GVkK ehkmAFpem1CRxYSg0C22Bpp3DcRtRIy+TWFcq3XQgP5ZAiuLraaVWK52g6Q1flx+wl2m UykU1rEmySxi+SPdzsg+C2GkEwQS3apRq4JeswOqsjtWDJ8VyCWvgA3fSBKDE3hOznvW y5ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1708352668; 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=lQhVEWWp6EDDRJX5SIlYfXpYYLw3PJ3G2bWblXjslbU=; b=bYlGjU4srUvPzTrKSC+JIdp20Oo5jRe3+C3+n7EIjLQBv3ADNGp25iuT4dg/LHrciD qu369X8ejpdzkbI94spZmqptf4CLWHflofC59lzvFybGdN+NzKW1GVw31cBrDESHG8O+ kWtKvYPLVzvGyFeqS1hfyfeMNtRmma9vh/XPu2nVF/u2Nf6G5fQlir07orOTcZLLPCSL EqfPuQjhKFtCVCHnWtNzhlx2nIgoDV53Shba4y8P9EkBoQ4Dj+zjYAWVqvVuFNptW5Yw a+GG1gTJLKhFF/aND0G+SECY2RzuNekaA0UPWGts5/ZKKsSNhvMMuM2UlUPyVeJWwKob HyHA== 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=1708352668; 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=lQhVEWWp6EDDRJX5SIlYfXpYYLw3PJ3G2bWblXjslbU=; b=Jxutdy+9/Fp9182GKN7oJkone8VhXnCzLSlyukdgOufyGWr7xQKQexr39dstn7vdmf JQl2mWMar4JDlV3tLObD/4dHHyzvD3Se8QwgnxHKu9Ji5nDvcRARzHmAhihrfRWmh5By BlDLJIolcLLv/Bq8Ccsn184A3qwomRdV7RhgKN+gR+aaneGaeLuQzBPSGcQrsmdlkrTh x+yH5e6hMlwFIXSDVu4Nls+T/XDGi7yJpFil9jCKEg6i6KJStDrL/5jRLdQD6vkFUp3D SyTYCmupKd24VKjpBQZloQT9hHFNHhNSQ3mzN32zKVKwl2jO0+JqhqNNS7qS4cga8Wkw AaZg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1708352668; 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=lQhVEWWp6EDDRJX5SIlYfXpYYLw3PJ3G2bWblXjslbU=; b=/q5IZHMaVmhotMor4vsSLYXBUgAynnFwGaRuvf/Qx4g0UozzPG+3mF+oNtKRYcO4rL sKxC8i2HyaTIESiLM3CQ== 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 Lb68c601JEORVdW (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 19 Feb 2024 15:24:27 +0100 (CET) Message-ID: <2bbf71cc-6b62-46bc-aa9b-3d062d7d7594@gjlay.de> Date: Mon, 19 Feb 2024 15:24:27 +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> From: Georg-Johann Lay Cc: avr@gjlay.de In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,KAM_LOTSOFHASH,KAM_SHORT,RCVD_IN_DNSWL_NONE,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 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