From owner-freebsd-git@freebsd.org Sat May 1 17:17:38 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 66B966328AD for ; Sat, 1 May 2021 17:17:38 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXbXL2QQ8z4jqv; Sat, 1 May 2021 17:17:38 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1619889458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Jv2KW/+UgfQDdeSu87Fh430HdKOvfR6p4H/LH1c5Uo=; b=KHxjuT9sTVdLPbaOMgIq7Gn5oqaIA73h6ZYItX770PfeYMVtM6DdAETFkKAnSNpmFvesfW AxEf4NiHt8qrpARCx/3JQQ0qx0/2gSLyXFNjT3I059DnZXg6yfwCX4nko+GvxZDuuQphel mNI03FhG5NXwMgAuxx9hyW5x+QQnQ+ohh7yxTlFRQZfss0B/bd+Kfhc1ymZ4KCZUK9T+ff LQaQVH/8YjFyQIkfj03eQpjJDKGcaNmauktND5yd5x0W3yGtxN8uBBtsEhMGMc6KYeEch+ ns3ijF9qFQnVilCCOSvmD+Qc/RXc7/Z4V9pRdvQPkHyA/HNOpPhgtU0nJYCACw== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 33335A0ED; Sat, 1 May 2021 17:17:38 +0000 (UTC) Date: Sat, 1 May 2021 17:17:38 +0000 From: Rene Ladan To: Matthias Fechner Cc: freebsd-git@freebsd.org Subject: Re: Script rmport shows error message Message-ID: References: <8613e467-9408-527f-d8f0-81a6db0bdce9@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <8613e467-9408-527f-d8f0-81a6db0bdce9@freebsd.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1619889458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Jv2KW/+UgfQDdeSu87Fh430HdKOvfR6p4H/LH1c5Uo=; b=kxkJjeGnAWwpwz6j9lm4TwQ+i+TQxiEE2klLrA1dX6aGUVakUGlwFds8C1CWcP/WcIchjF I8K4pXsXRK8LxJefVoUBUMGen6fMTPqL5ATskLDjzYJXFkgX4fMUafhWqQZdhgA48d0msI yzCXbdpmtNoL2KPW2F5ysrv8/yQhZiDqvFGj0HyCo12NxhTTDgTJAIChZc7L+tUqMHNqvm oPDLEP1Set4nvqfO6GrPFNPVFKN/R9w4gXnCtUS65r3xVI/lxri0CmI8rLYjmNUjF2+Pud kabGMgpjP/9cJyaHHQXMGhP6iI7lMSusCCELAcWIX2wVqiUDzVYPKTURY7Q/fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1619889458; a=rsa-sha256; cv=none; b=USklu2mzUht183Z6iagwEehkdCJqr34JRrOQnkW021/3BUKA1mLF942/HT2vOTITzSqCIu aMHG609kh0KKCd9MEuaGQ/NQ3NS9JE83vP4V7FlBGO0mddjRjWcn1J6bSfsFU0afT4azlq vfN+IogHtgbGNxa9CcGP8FT1ZMf6TbixGfCKqRGaXCLbjIlz5dDc+MtGnkkVpDfIqJP/3N xR3GpPK+3LO+FpdEJYeRckpXBQEhEqzrFs4IRcQaxY2B7tZziovSFno9Y5vbt6kGqP5VX0 Og/7DPPmXOmBL6/sRQB8asbLkfNBopV3CLTC90rulMnPloMoUdVlokmbwl7Jmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 17:17:38 -0000 On Sat, May 01, 2021 at 07:07:08PM +0200, Matthias Fechner wrote: > Dear all, > > 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 > > 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? > It might indeed be because you have a remote it does not expect: if ! ${GIT} diff --exit-code remotes/origin/main ; then ... fi Here I have: % git remote -v origin https://git.freebsd.org/ports.git (fetch) origin git@gitrepo.FreeBSD.org:ports.git (push) René