From nobody Wed Apr 13 15:06:02 2022 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 E449B1B0058A; Wed, 13 Apr 2022 15:06:02 +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 4KdmBL5dNRz4hrv; Wed, 13 Apr 2022 15:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649862362; 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=umQWNMAhkuBjm3COaLUGKnZz47xMwEjFJTzWrNg0bfY=; b=p/Ktpp6885ZgrQk998eqjE+n/gqzYauz66SNys1RG7v18xoLKfN74U3mkB7svV3j3xNXxd X4FtKxB9J78BdoNTZTD5+b/m4q9xlevHqNK+Gde7BPOpDL5FRk82Eof51gGxhs54DPFlVb mM4oDquqNbSSCGhTnkscuhl7IBXu33wkJK3CDQlU5zMguxsz6ojfvw9oAlRXjDQmPTE75f tR8BO1iyiV45xxp1AjRRKji2bCdZVMX0LYGHmmFm7ik+w1Qc5EjtoQ1rZNzG/L7KM46DOG URvzQGvkK+IA4FPzHDUeFaqxK4Bd1gZ5ANsaBojePo0gOT4VU99DtdlPjJZCPw== 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 980A65E43; Wed, 13 Apr 2022 15:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23DF62aA024377; Wed, 13 Apr 2022 15:06:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DF624f024376; Wed, 13 Apr 2022 15:06:02 GMT (envelope-from git) Date: Wed, 13 Apr 2022 15:06:02 GMT Message-Id: <202204131506.23DF624f024376@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 016bfb0a974a - main - etcupdate: remove redundant diff3 flag 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: owner-dev-commits-src-main@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: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 016bfb0a974a97683ff81d949bbc2460323023b4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649862362; 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=umQWNMAhkuBjm3COaLUGKnZz47xMwEjFJTzWrNg0bfY=; b=U7X1GJHRK2IGVss8Ecv5lNZwJETbPX7Fw8q6gDDOx3ruC5tcxBlp72S2sPyrzkGKP5XhPu jghWhPA9IFmtSivYc5wTP4pCLsMwsWsC5LWsuX0ozOse7+RdhMl8kN5CXy/CRImtltTxWf INmvjisbM5H14IaMNc4zmXSY8H3l5lvK7cNVj76YWyEDoMnjPxif/umkBzed+0/t0melBX FdcJmz86PIozuqgDuDPEj+kgOGTYx879pUezQbUGbVHBe/p0lqetyivHfFOiM/8LheqwL6 58K7ETmGmCkFXjbvdUSOn8nQ9o05PoMtQq9LPg4wos5+tgBR3vri1Eu6YhIw5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649862362; a=rsa-sha256; cv=none; b=EE/jQmhf0dBQBWIuiMJlgQgI4pjndojwfnsX4YYIViCSWRrJS9Fn3rl32sBdRiT+jR3N6x UrfwdcCvG+6JtZR+mxxnrp7IhMEjvSvjZ5JpX6TugsCTTJ2cP8kRcP5+Hk4cGFgJWbhksx jA6zpb3reiYTwMUP+QBwvBb3kFX495KRCyvXPAnKVZ+Ry5M41FOVT4r1A43BiuI87Jhmid O4iWmYVAULHkL8hCjy6/aV08S6CSvsTTT+LoHxuhdTTJ5wYfaAhTxaAU4hCQ8N3RBoCg4a uWVNJnYPrPZMWTJiDvMGEFf34XXgIebHQCShyj3Cxqk26aK5Uj11y5KL1GrTyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=016bfb0a974a97683ff81d949bbc2460323023b4 commit 016bfb0a974a97683ff81d949bbc2460323023b4 Author: Tom Jones AuthorDate: 2022-04-13 15:02:15 +0000 Commit: Tom Jones CommitDate: 2022-04-13 15:05:32 +0000 etcupdate: remove redundant diff3 flag -A and -m select different output modes output modes for diff3. When both flags are present gnu diff3 prefers -m, drop the extra -A flag in etcupdate. Reviewed by: pstef, 0mp MFC after: 3 days Sponsored by: Klara Inc Differential Revision: --- usr.sbin/etcupdate/etcupdate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh index 162a44059e3e..40868fe6586e 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -849,8 +849,8 @@ merge_file() # the conflicts directory. if [ -z "$dryrun" ]; then install_dirs $NEWTREE $CONFLICTS $1 - log "diff3 -m -A ${DESTDIR}$1 ${CONFLICTS}$1" - diff3 -m -A -L "yours" -L "original" -L "new" \ + log "diff3 -m ${DESTDIR}$1 ${CONFLICTS}$1" + diff3 -m -L "yours" -L "original" -L "new" \ ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > \ ${CONFLICTS}$1 fi