From nobody Thu Apr 11 17:44:54 2024 X-Original-To: dev-commits-src-main@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 4VFnCB5PQBz5Hnn0; Thu, 11 Apr 2024 17:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VFnCB2dPCz4TXw; Thu, 11 Apr 2024 17:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712857494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KO1Xg5MPRI0UUbPoAH/8ggelJmK6+0Mc93BlFSfhfls=; b=aM9yB3hnx9uXhk4ggivK4lZ6C2ch/qO7ub+SQEWqpSAq914wj/191cLoCmJBcaR971I/Z/ XPQuwoKNFc0s2R3slzXF/bptOgIxQdwqhzj/7Ilv3xZ+SvcUOuJiQH6Vl9xdGMSa16ad22 QoYQUxnzbzbtHjLTt3hmICVuRu/gG5AaDppZ65gXLnc6EBASJKQMBd0FOORj/tgPBnyWpK upcKMYtxx3UBb5BTKJRsIuM1CwvRaBocd8GHEyfedOxwHb4gonjLAa2es2olYPrI9Hthhr PrGih/a8ZuFv+8lQGOgSs5UML92B6z9k6mD0bqdeSmP5VE4IDC6TzNnXZwcRJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712857494; a=rsa-sha256; cv=none; b=t1m3O3fXKvQvtZCVeWMN6/g7eB+5lCDx5zU1N8UhivbAyNCDqSmyzD7qIG2BAUc42rnJzv UDtOt7xmwkjcluoN23pyQQodyNW1/9wqKA3iwHpqCo7ZRQA0LwAGoJfmItcDNgAcdKGyYh 1yP9nZhOpBGyRhUchpsEaEw2myN+gTBdm8Cw6UZRSD89KxwHIZaj1CgDdaSRUuiRq6HSuV uvkmoLd90cSLvTZki5ZPDJqkCxDfRmPs26ZLXIMoKvdNtelLxlG5ms5fpUS39dXhnuXJdl 1FOKj0c4ausXOepTEa7z5a4QclrR/3YXIJHtIzeSMKBvuF4Yej858Url0kSCrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712857494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KO1Xg5MPRI0UUbPoAH/8ggelJmK6+0Mc93BlFSfhfls=; b=LIig08pM5kCrQwxCf4/qGG8QZe5JMWdFpPZyIBU29+yiQbOBQ6E4lhVdpatwK5exb36Sgd SER3rf+gmjop1vECQZbiu19HvL4GMB7suakCw3RHfM53q4bmG7xHWybOX5UNdpw73RVCoL vuqxdNIJr1oOpe4+ehvqKII3rOJm1+/C4oW6oQiK3Eo+iPOdPMpUkUMvRIZKuXf2/lHwmS k3E9WSnpUrF25+S3XrYCMnAxFP+8WXvEf5zzqc225kIaFZPBKL3nJdU8rLf6zDKILk55qZ R9nat1lzTj+USYOL6Y/NmbF8ssD/AcZDHH437Oi6vX+spYnnk70oYZbgJ2bH0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VFnCB27TFzFbb; Thu, 11 Apr 2024 17:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43BHisb7086986; Thu, 11 Apr 2024 17:44:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43BHis8o086983; Thu, 11 Apr 2024 17:44:54 GMT (envelope-from git) Date: Thu, 11 Apr 2024 17:44:54 GMT Message-Id: <202404111744.43BHis8o086983@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c384235c1633 - main - mergemaster: Fix typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-src-main+owner@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c384235c16330cb48c3b0b02ff821ff0915bd2a4 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c384235c16330cb48c3b0b02ff821ff0915bd2a4 commit c384235c16330cb48c3b0b02ff821ff0915bd2a4 Author: Elyes Haouas AuthorDate: 2024-04-11 17:40:05 +0000 Commit: Warner Losh CommitDate: 2024-04-11 17:40:47 +0000 mergemaster: Fix typo Signed-off-by: Elyes Haouas Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/882 --- usr.sbin/mergemaster/mergemaster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index d362af6a2b4f..572415164101 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -1246,7 +1246,7 @@ handle_symbolic_link () { esac } -# Compare symblic links +# Compare symbolic links for COMPSYMLINK in `find . -type l | sort`; do if [ ! -L "${DESTDIR}${COMPSYMLINK#.}" ]; then if [ -n "${AUTO_RUN}" -a -z "${AUTO_INSTALL}" ]; then