From nobody Fri Jun 24 20:14:35 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5E10686CA4D for ; Fri, 24 Jun 2022 20:14:45 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from www541.your-server.de (www541.your-server.de [213.133.107.7]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4LV7dJ22Xcz4j9L; Fri, 24 Jun 2022 20:14:44 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from sslproxy03.your-server.de ([88.198.220.132]) by www541.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1o4phM-000NMF-Cy; Fri, 24 Jun 2022 22:14:36 +0200 Received: from [188.167.171.2] (helo=[10.0.9.122]) by sslproxy03.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o4phM-000Viv-77; Fri, 24 Jun 2022 22:14:36 +0200 Message-ID: Date: Fri, 24 Jun 2022 22:14:35 +0200 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: Merge of vendor/openzfs/zfs-2.1-relesae to stable/13 forbidden Content-Language: en-US To: Li-Wen Hsu Cc: freebsd-git References: From: Martin Matuska In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated-Sender: martin@matuska.de X-Virus-Scanned: Clear (ClamAV 0.103.6/26583/Fri Jun 24 19:50:16 2022) X-Rspamd-Queue-Id: 4LV7dJ22Xcz4j9L X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=softfail (mx1.freebsd.org: 213.133.107.7 is neither permitted nor denied by domain of mm@FreeBSD.org) smtp.mailfrom=mm@FreeBSD.org X-Spamd-Result: default: False [-0.88 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEFALL_USER(0.00)[mm]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_SPF_SOFTFAIL(0.00)[~all:c]; NEURAL_SPAM_MEDIUM(1.00)[1.000]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-0.78)[-0.776]; RCPT_COUNT_TWO(0.00)[2]; MLMMJ_DEST(0.00)[freebsd-git]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:213.133.96.0/19, country:DE]; RCVD_TLS_ALL(0.00)[]; HAS_X_AS(0.00)[] X-ThisMailContainsUnwantedMimeParts: N Hi Li-Wen, I use the same command as always: git subtree merge -P sys/contrib/openzfs vendor/openzfs/zfs-2.1-release The local vendor/openzfs/zfs-2.1-release has always the state of refs/heads/vendor/openzfs/zfs-2.1-release 2 additional files are modified during the merge: zfs_config.h and zfs_gitrev.h Here is the merged branch: https://github.com/mmatuska/freebsd-src/tree/stable/13_zfs_2.1.5 On 24. 6. 2022 16:52, Li-Wen Hsu wrote: > On Fri, Jun 24, 2022 at 7:17 AM Martin Matuska wrote: >> Hello, >> >> there has been probably some change in configuration as I am not allowed >> to merge vendor/openzfs/zfs-2.1-release to stable/13 anymore. >> Please could anyone responsible take a look at this? >> >> remote: ================================================================ >> remote: Currently only allow merge from vendor/* to main >> remote: ================================================================ >> remote: FATAL: VREF/MERGE-CHECK/src: helper program exit status 256 >> remote: error: hook declined to update refs/heads/stable/13 >> To ssh://gitrepo.FreeBSD.org/src.git >> ! [remote rejected] stable/13 -> stable/13 (hook declined) >> error: failed to push some refs to 'ssh://gitrepo.FreeBSD.org/src.git' >> >> Thanks >> mm > Hi, > > I'm sorry that the error message may not be enough, but this > MERGE-CHECK hook has not been updated since we allow merging from > refs/heads/vendor/openzfs/zfs-2.1-release to refs/heads/stable/13 > > I tried to search for the possible issue from the gitolite log but did > not see the root cause. Can you help: > > - List the commands you used to merge from > vendor/openzfs/zfs-2.1-release to stable/13 > - `git show ` like > https://cgit.freebsd.org/src/commit/?id=1f1e2261e341e6ca6862f82261066ef1705f0a7a > for main? > > If possible: > > - Push your stable/13 tree to somewhere (e.g., a freebsd/freebsd-src > fork on github or any other place works for you) for me to look into? > > Thanks, > Li-Wen