From nobody Fri Jun 24 14:52:05 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 EF7E387A9FA for ; Fri, 24 Jun 2022 14:52:18 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LV0TG6CXBz4sb9; Fri, 24 Jun 2022 14:52:18 +0000 (UTC) (envelope-from lwhsu@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656082338; 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: in-reply-to:in-reply-to:references:references; bh=f6Eg588moExQ4U1IJfJFPAswBCLE4a+3Bc2xtc8366M=; b=s4BdjadmhFk920XauLwXXc1/CAzAleDzwaUFHtY0gTQzYLyYWiSioay+ENV0dGDfXNau1g ErL0teSfnhNiCBG4iyV5SqktIUPhJXdYiVeVfUSJctgVnid15AwUuIIyUarE0U8qAEmrgp bo5llY+I6WJda5t80F+beVJ07lXobTEgVwBIQgErnh1G3PRsuPxRpTUwa4kG1cvh1h2bBL 9dLnrWA9FUgbW8ff0M+tKm/clcCGZz3qS9IOuoysHz4X+WBpDO3EbO0O2yGZXLTc3OYYQm KuCvllfe+Y7rF+XflWt6kMq3xiQ4aBk06Th5e/l5Vwx76waeCrstfSQ10Ao70Q== Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: lwhsu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id B4940C717; Fri, 24 Jun 2022 14:52:18 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-ej1-f45.google.com with SMTP id pk21so5248859ejb.2; Fri, 24 Jun 2022 07:52:18 -0700 (PDT) X-Gm-Message-State: AJIora/X+DZ1gPCoI8i7YF6EZY7CEVi5/Fo/FgRGXo+nrZMqPooTShNZ DLNvof0eoP96haZKWQqVsh7ycmVpH3PYI4O6N+w= X-Google-Smtp-Source: AGRyM1siaDpz22wMJpRDPY45UMoeHT4lAoD3AarK9QZQkUmI2nAffH2qruOhRhgx5OLSFMIQNmHrQUlUt1iry79eELc= X-Received: by 2002:a17:907:6e8e:b0:722:e15d:b89e with SMTP id sh14-20020a1709076e8e00b00722e15db89emr13620458ejc.12.1656082337277; Fri, 24 Jun 2022 07:52:17 -0700 (PDT) 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 References: In-Reply-To: From: Li-Wen Hsu Date: Fri, 24 Jun 2022 22:52:05 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Merge of vendor/openzfs/zfs-2.1-relesae to stable/13 forbidden To: Martin Matuska Cc: freebsd-git Content-Type: text/plain; charset="UTF-8" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656082338; 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: in-reply-to:in-reply-to:references:references; bh=f6Eg588moExQ4U1IJfJFPAswBCLE4a+3Bc2xtc8366M=; b=XryUpROSLFyZR+KRk3B0En+Ep0MfgD1lX5iq8H8pg4Nco4MLCZ6FC5rCcTSOwWtCPXr3ma +Cb2z5D9Z45f19VWABUso5d3+B7bwsOlHWerXywbMw5Nt+vHfZoaaQmePWmD46cnOJti8K uAAEzXT2BknerfKQ4RQtaDkiyK9n7wt3X3cyYZEolmFuBsRXWCfWOM1qlFrgY3epvaxjV8 FmKNvfEF79rMpdRB5w2Plt4+yTxRLtH4K7WLieZaE45UEnOnkTOBzYWnllF9zWP6lxExZI YD8/1bBfo6zlnmfXudhQCUwaoieDO+LwlkyEIdWSMC9XbITb8agRoqH77tHrzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656082338; a=rsa-sha256; cv=none; b=LHKgkXqareC3xXtORz6VfPoBWt6y6ZL/9KlfYvus6dMcw0RWt/KMddLj2v/GbKdCvlZqMT tbkBdJMfuWBLTzpmMK3fk4fd02DPPANz9a5Oswk9zjGOoOnyCcUmCqs20OZCMPFYkKHBTY xKMzEnoncCs9MRHNMzT+H0OJrtB45WdxWSyC82wsJhoa5oEN5QQbAl1firP19/El3KjV1l /yX+94m0Q61gZv8680z3HHIotc2P3CdtMvCNGFPOxBBnyIkOZmeEvrRZqWEf8U/xEGC3MK n6+Jh3py+pM5A5IpNxb5uF+87LhQQbBdjZWd4SZUMXWmNVtdMX2o4FjPZs1u6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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