From owner-freebsd-git@freebsd.org Sat May 1 19:50:18 2021 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 44A5E636480 for ; Sat, 1 May 2021 19:50:18 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic308-55.consmr.mail.gq1.yahoo.com (sonic308-55.consmr.mail.gq1.yahoo.com [98.137.68.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXfwT74t0z4r7T for ; Sat, 1 May 2021 19:50:17 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1619898616; bh=gQxWV0w20Mmgo0AHi2UKX4rTv2B/peZ0IcXqTmCYVbO=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=HnvxkbUaYqX5LXBl/lHm/WBRiGrlFTnThWJollFg4ZPoO/DY4XUc+D0KYRCwTX60QA4IEStBzHPEJs2s0IhRvp3oMKOB0KJd1UrVHNbVAoBgcQ7PZZpTchSL02WDBIK8YbYu5LycusoPe5d7HOFL6IQnK7omU5nzvG/clhXkyCe3102XBV3r7e/gbuaJWMNlPFPz6+yHGpykuyPctqWA0daLNaKfXyAISUOmlrY9w0b8rcdoOSJqwRNZzvBqDA3UFCya686XLyAWMHTTCsWS4uIkyUvGTF6gR0UkZDBS5T9w63d3pzjRVj36JOA0reCG5LDrHi8gH3YNy//7KwturQ== X-YMail-OSG: OKek.mAVM1mtvvhQnvPxlv4sf8HhIHA0bQAqzgf3tkQ2diBwM.rjiyfbse_byv4 8WCHnuXg7zrWPeu9LqZicOYUk8TClfWz3PVFviNsuebpGbL0T9hcFy2JcnHfbYJ8UjoGsv.Huqru WoClVFCdwTle.F5eapnU_7umdswwdJy_6wfQYSqLcLpOTjTTBu3LDBaNJDWKJKCITAXokbSW4rBZ u4vcHqkep9FAgnlu1ssh7xi448Atl6ac7wB6Vipx0wS14s0uTia71TY2fLUgccIIqQ87yT9Lz3xQ aWWX9LxXWIkOrJwxhCnfqOvUAl9nxL9M80el27m3.cdD.ZpqAqrp0kt6HGgnihcnUwgd1q_gGfRP CY8WDPPkmz9qdC9IKtW2VvFaYYxxfdsLVQKNHzfccjGe1wrSV8FMD2sJvpcDTDHfPge97XkMi2IV VW4vSaNoCAW8203.qBzFfn34vInYIPdWOg1K3ZNXp3EB777IY9YaGNXAUhEkDSUYfhQ9ENXcjHdu 7nL5Dp3.U7gqcQZKXDZEUiVTqQLSDQZ.XkhJGq8OCL38rjDHjjsGsNr.eko.PTKbZfRNvK2v8ik5 .JcY.P92wjM.nGeRc7HyOFD2Mefom5zbxQ3WiSLN_JO0mrAqsf1G3TeTKl8XBUYv2ljQLXIl_xj4 6elthNeezM7E926ThYTSUMfPIZUzE4JvjJweqnP7hLdJcg_e0B1CIJMwgarwxm2aGby9unts5RsJ j6eP6.EmnB2EHqc.NR1RtmEjBEnh3W6h79vipX2zw3KaAbxthNMrteUavE2mFCkWvaSfvF5uS_JC iqFVVh0GHWhwRgWXkGNFAduXA_42uCI0ePf5qa9FM1IkYHSymzg6E8HQ77wUDs9O9yOjpEAkk3J6 Xy2OruCJ261qEU.ujMPu_H9bBs9wi3GZqAXpdCZcKgoygrXJ_fvRRsN9if.YARGe8.1MO7AjLbqm CxRrWW6mAPM0rlOXhMxZqkBsQ02rtqfsuRyeIjTpCKMtv046IhPEjUNg9CjXi90A8BMJKTEuprZ6 92q0xhGF79YVZBmXZa6EYI8otMaV1sN5x1UOA1I5iadohvhhJoGbC72bNc45Br._K0W_RRO6xNpi zAiWZKINgl0Oa5W.51VVX_AZHo7z2CVhuxzNn9mV84vBNlGCWhym5CyO3Lcs_l6nFZV7LgLRLVZJ eIFSDwEbVlUJoXUqTpSqnxJ9tqWukpabs7ZQS1rlvN84zgqpD1I_c_oOsi4XjenBGdpA4srIO3lE CurCTORvhB17tkqSm7owcUT3D1BJd3aTaEiWTLTbigL4IrtRKXNJNzQKgZQk.UPEBvT5.7ovEkSx 4xNMAXh0Rl8TYmGefBF87zCWSkW4rAB5o3nk1Sm56.mVcYJ3Qp9Us9IhiBwOpYoRH.76GrbIHFNm NBaf0K4l8NSFZwhx2fR_rXGyn9NDuYZMpEYpU_nKt8JwI445kEPq6Yi8oie4ZFDOkjfVhBzwJwgF PdLKEyQ5vrDQCrvcUr.u6w5lGJWSvTvIZqd41ye5cI2z74LM8V5X2fmPDoqYdNCOhPzFlcE2M.du B6WsbgdNY8aHwteX.254DnDFFWgkj3jur_yjy6uN5NJgAjPYy7cuav6XY7ZWVCFmLF0nBpkrvDS4 wvQgXA49ZLnrttPg.zGCapsZznyDj20JogMFVuP7giOkiOPutAxjZbaEyeWqCgwEJBUQCMbPbs0E 74Ad9xf3qy_KdjOpsZVczk52II1XXxHleGwmNLireRB3ByufsuBwCQPpiM2CQRwjcBlY2PLOTar8 FtDC4ZA2o3skTet._cOa.iairg_ZEXXwP2UVAmlZBBSrO6rcQvdVMAmD3Y3K15nRl2UA4BSSpJcH TBRYfYIAEn4JMZFUHrPltNtJzOUSvQ1GB93w3FWfvMcwPu3U.2cKPrj1Z2paVzG9pPOw59hQXZ0l LuRjg2UX8NE3V8WyLAQAu3nTy9A.fLoE5y0_yT56K45ejWFQnzkevye6JxX0jCeL_FHQuCTaBwj8 CYHaML.Stk_QoZENsIt_uiCkSvgeFII_hH2QGuUhnli1HkwuZuvvZj3yIhM4YdODkQth7Pybv3MK IXdxCtTB_Ce3zFoiYUNxRGEXcAJmHzb6zTSHRYo38mdECVqF787.NuyNXqZVB6839Icvhuy8xVA0 X2QGqlth6ZD2NSf_6Jfv4Qn3OSX0qAoKQWPeCiswTd2MOMh5TIQo0yL6vw4Skq9oc28GSfVpbQMU J3fcKR1v2r1s6lWOo6NccpCKhyUp24N6XpMRyR7IB.hRH3bKUbHHIJJwNQ3kh9Bl7tjaWXz.rrLu 8lXSNJkKyNAyg5Las.tJT.cou9fOM9Ae6Q9wgmgzWZDCUqGMqNb8ZZZlo7.F3ZUNLkeIgjSEL0al dgcaCHVXMDD7XPt.vDOG.oZF3TeFC20_c7cao64i0BP5SIV0zcSoxBBTmWrX.RSMSMo9znnYM52m 9S3rcAdPhHoeIJjZM1UnoILos3T._xGqsGPJoKV74xf82EAz7Eqa.jKf28vcFnVBjoOnkPRYUH.T x5WdR5KMMQnFqSrsdet3IzuOPddNCc.vJENRKTPHckQu4Hq5IRiV0qqvqKnbTRDO3hUHbl1EnGTt ZYFGixnW0ZWv3HNL7zyNYlChVn9n_6NwesmnlDrSYd3hiv2bFeI9oweAdo.2R1l3imVnqxzGl6Ci ROHDHBC.sVRL_RK4Kwpcm3uSEJGLQaLyxN2r0lJrRmLRiHijC_4oFS6s6Pv2H1eevQ9A- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.gq1.yahoo.com with HTTP; Sat, 1 May 2021 19:50:16 +0000 Received: by kubenode508.mail-prod1.omega.ne1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 5404461507336f11b64b67c0117f5011; Sat, 01 May 2021 19:50:12 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Re: Script rmport shows error message From: Mark Millard In-Reply-To: <8613e467-9408-527f-d8f0-81a6db0bdce9@freebsd.org> Date: Sat, 1 May 2021 12:50:10 -0700 Cc: freebsd-git , "rene@freebsd.org" , Warner Losh Content-Transfer-Encoding: quoted-printable Message-Id: References: <8613e467-9408-527f-d8f0-81a6db0bdce9@freebsd.org> To: Matthias Fechner X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4FXfwT74t0z4r7T X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2021 19:50:18 -0000 On 2021-May-1, at 10:07, Matthias Fechner = wrote: > I thought that the rmport script was already updated, but I cannot use = it. > I tried to execute it with: > Tools/scripts/rmport databases/rubygem-gitlab-pg_query > fatal: ambiguous argument 'remotes/origin/main': unknown revision or = path not in the working tree. > Use '--' to separate paths from revisions, like this: > 'git [...] -- [...]' > you have local commits, exiting Summary: ports/Tools/scripts/rmport does not yet seem to be set up to expect or try "remotes/freebsd/" instead of "remotes/origin/". Details: If you follow the documented instructions the refs for the ports main are (ignore any refs/ prefix): # git remote show freebsd # git show-ref --abbrev main a6233da12c53 refs/heads/main a6233da12c53 refs/remotes/freebsd/main If you are not set up to be a committer you might have something like: # git remote -v show freebsd ssh://anongit@git.freebsd.org/ports.git (fetch) freebsd ssh://anongit@git.freebsd.org/ports.git (push) (Where the push one is not intended to work and there are https:// alternatives to the ssh:// use.) You can use such commands to check on what is set up in your environment. This contrasts with the typical defaults, such as from another git context that I have (older github: so master instead of main): # git remote show origin # git remote -v show # output edited origin https://github.com/OMITTED/OMITTED.git (fetch) origin https://github.com/OMITTED/OMITTED.git (push) # git show-ref --abbrev master ae3f9ba refs/heads/master ae3f9ba refs/remotes/origin/master As for ports/Tools/scripts/rmport . . . # grep origin /usr/ports/Tools/scripts/rmport if ! ${GIT} diff --exit-code remotes/origin/main ; then # grep freebsd /usr/ports/Tools/scripts/rmport = url=3D"https://bugs.freebsd.org/bugzilla/buglist.cgi?quicksearch=3D${synop= sis}" So no attempt at use of remotes/freebsd/ use. Locally you could replace the "remotes/origin/" text in the script until there is official support for the documented way of setting things up. > But there are no local changes: > =E2=95=B0=E2=94=80 git status > On branch main > Your branch is up to date with 'freebsd/main'. >=20 > nothing to commit, working tree clean >=20 > The FreeBSD repository is under freebsd and not origin, maybe this is = the source of the problem: > =E2=95=B0=E2=94=80 git remote -v > freebsd https://git.freebsd.org/ports.git (fetch) > freebsd git@gitrepo.freebsd.org:ports.git (push) > origin git@gitlab.fechner.net:mfechner/Gitlab.git (fetch) > origin git@gitlab.fechner.net:mfechner/Gitlab.git (push) >=20 > Has anyone an idea how to fix/use this very useful script? >=20 =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)