From nobody Fri Jun 24 20:52:42 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 C3C1987171D for ; Fri, 24 Jun 2022 20:52:55 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4LV8TM51Z3z4mnR; Fri, 24 Jun 2022 20:52:55 +0000 (UTC) (envelope-from lwhsu@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656103975; 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=6NtfNdUOaYvSKst3m68TnFRmanL0UfyJr4dSzzPeofU=; b=Wc+v3tq0UzzfdruEf9kRXBqmnooZaCVZCjQIwd8Go5ybTIi9/OFVvo1yDmPsO6CxVfNQcI 0M9l7ukrYD18YQ7MBAzynTR8Xi26KY282SWIl9CZOlH+Og9dChQSVQNZr8XBe5VUDja6qd 6EZoET0z+LQ6V3cu7nUeZELNyuzAtt1VTmak7iNAF7Sr4B7Ns2VQ2aiW8N9Ogm7Ry1f+VM iFM9B2bEg/9UjsqdFMChPImqBsl8inoXtqEpG9+IzlKORrlF/f0dKIkkaPh3bt9inloum+ XMjX0WDCQDXV20XaHwe1TzdoB8MNiRWq4jckcRfalC7IlLYBkU2GIy24IAXToA== Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (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 855AAE4EE; Fri, 24 Jun 2022 20:52:55 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-ed1-f49.google.com with SMTP id e2so5089705edv.3; Fri, 24 Jun 2022 13:52:55 -0700 (PDT) X-Gm-Message-State: AJIora8Y1uUTEaRn+xcFoOklgKyIH8H66k17QktjWkjSSA6Q69JUZtq7 dl0gFGRNBHyeNHg+rchG4dNVmzgNDijaSRLiYl0= X-Google-Smtp-Source: AGRyM1vKX1Z9voIctB/HZC0ByJdgLZgx/KU+NUkEwQGgnBGPUNDlrPYfmMYn6Vu6G8sVj2lPzz8MhHOKg8H9rZw8Cp0= X-Received: by 2002:a05:6402:f0e:b0:435:8b5d:ece9 with SMTP id i14-20020a0564020f0e00b004358b5dece9mr1243290eda.276.1656103974068; Fri, 24 Jun 2022 13:52:54 -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: Sat, 25 Jun 2022 04:52:42 +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=1656103975; 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=6NtfNdUOaYvSKst3m68TnFRmanL0UfyJr4dSzzPeofU=; b=X+bcjLfecyyfmU5pS/ZQpRq0VuHzrwpfqZsMygZcMgtMlZ1jQYUcaednyy7LaksA85nV9B dRnaRkmH2+YUqi2t+h99pGaSJlvqPeBOmJzWD50bMyCs9V0box9JnWAukBC1WueTze9I9K HqrHYm+YMnw7i+N5SnH5noEHOmygrkB64S4c/TQUwUGwApsuJRIaCANd8OLrGWKB+75x7S cxyrY9pIYrQJd/IvID77E6nr2Z78qBT9N4im+7DdcCN2VHjHXpLpDSnkAn0/0yxMETi5vY QIREmnvUD5X0S9HjFBAM8c1NFPI3O8ZkfVLYmLgdUrwvxpCDIo18A4WZM5iNMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656103975; a=rsa-sha256; cv=none; b=rENTPQmnmQwXzC/AN+Y2wGcyVSzYs6KkuUCkovC1cbqGjkJT014Tvo4ggj9eRIBE7vc36e rvtBVCdwDr8teVaqblhV04MK8yhAGXNMs3NviAlDFMBQg8UNTXRyTT3tc3hP1eeLG8JiMn hoBdaRncuaVS8Fuk3JMPH4Ex8AZl0/bh2NLiqQ02KVegIhw3dGagwsnvWDTmvzphZcP5E6 oRlp0okGOeSMLNaM2bGJ9ADNuIfNKjshy2Y3nEkihD0WnWPVTfimekIwjPid5f7f5r1xHa r3kTJKJILmm3OydJLiSqYTHDLtLKBpuVMryR9lP7bYrBC1iqHELtgOlJgOMh8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N Thanks, it is ineed a bug of the MERGE-CHECK hook, the weird part is I don't know why it didn't affect the first time we're using it. Please try again. Best, Li-Wen On Sat, Jun 25, 2022 at 4:14 AM Martin Matuska wrote: > > 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