From owner-freebsd-git@freebsd.org Sat May 1 20:24:21 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 D317D636DFD for ; Sat, 1 May 2021 20:24:21 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from udns.ultimatedns.net (static-24-113-41-81.wavecable.com [24.113.41.81]) (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 "ultimatedns.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXggn318Dz4sRG for ; Sat, 1 May 2021 20:24:20 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from ultimatedns.net (localhost [127.0.0.1]) by udns.ultimatedns.net (8.16.1/8.16.1) with ESMTP id 141KOGXB012779; Sat, 1 May 2021 13:24:22 -0700 (PDT) (envelope-from bsd-lists@bsdforge.com) MIME-Version: 1.0 Date: Sat, 01 May 2021 13:24:16 -0700 From: Chris To: Mark Millard Cc: freebsd-git Subject: Re: Script rmport shows error message In-Reply-To: References: <8613e467-9408-527f-d8f0-81a6db0bdce9@freebsd.org> User-Agent: UDNSMS/17.0 Message-ID: <0cf94bc07be4340beddb38b924950585@bsdforge.com> X-Sender: bsd-lists@bsdforge.com Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4FXggn318Dz4sRG X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:11404, ipnet:24.113.0.0/16, country:US]; local_wl_ip(0.00)[24.113.41.81] 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 20:24:21 -0000 On 2021-05-01 12:50, Mark Millard via freebsd-git wrote: > 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="https://bugs.freebsd.org/bugzilla/buglist.cgi?quicksearch=${synopsis}" > > 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: >> ╰─ git status >> On branch main >> Your branch is up to date with 'freebsd/main'. >> >> nothing to commit, working tree clean >> >> The FreeBSD repository is under freebsd and not origin, maybe this is the >> source of the problem: >> ╰─ 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) >> >> Has anyone an idea how to fix/use this very useful script? Just wanted to send a big thank you, for taking the time to post all this, Mark. A big help for me too. :-) --Chris >> > > === > Mark Millard > marklmi at yahoo.com > ( dsl-only.net went > away in early 2018-Mar) > > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org"