From MAILER-DAEMON Sat Mar 12 20:42:03 2022
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1nTDFD-00035S-MH
	for mharc-bug-diffutils@gnu.org; Sat, 12 Mar 2022 20:42:03 -0500
Received: from eggs.gnu.org ([209.51.188.92]:50448)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1nTDFC-00035J-Ml
 for bug-diffutils@gnu.org; Sat, 12 Mar 2022 20:42:02 -0500
Received: from debbugs.gnu.org ([209.51.188.43]:47365)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1nTDFC-0007eD-EM
 for bug-diffutils@gnu.org; Sat, 12 Mar 2022 20:42:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1nTDFC-00081I-BF
 for bug-diffutils@gnu.org; Sat, 12 Mar 2022 20:42:02 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Vincent Lefevre <vincent@vinc17.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Sun, 13 Mar 2022 01:42:02 +0000
Resent-Message-ID: <handler.54365.B.164713571930817@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 54365
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 54365@debbugs.gnu.org
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.164713571930817
 (code B ref -1); Sun, 13 Mar 2022 01:42:02 +0000
Received: (at submit) by debbugs.gnu.org; 13 Mar 2022 01:41:59 +0000
Received: from localhost ([127.0.0.1]:41262 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1nTDF8-00080z-Pq
 for submit@debbugs.gnu.org; Sat, 12 Mar 2022 20:41:58 -0500
Received: from lists.gnu.org ([209.51.188.17]:41170)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <vincent@vinc17.net>) id 1nTDF7-00080s-Ug
 for submit@debbugs.gnu.org; Sat, 12 Mar 2022 20:41:58 -0500
Received: from eggs.gnu.org ([209.51.188.92]:50440)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <vincent@vinc17.net>)
 id 1nTDF7-00035B-MJ
 for bug-diffutils@gnu.org; Sat, 12 Mar 2022 20:41:57 -0500
Received: from joooj.vinc17.net ([155.133.131.76]:37976)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <vincent@vinc17.net>)
 id 1nTDF5-0007dN-Q2
 for bug-diffutils@gnu.org; Sat, 12 Mar 2022 20:41:57 -0500
Received: from smtp-zira.vinc17.net (128.119.75.86.rev.sfr.net [86.75.119.128])
 by joooj.vinc17.net (Postfix) with ESMTPSA id 0267F29D;
 Sun, 13 Mar 2022 02:41:45 +0100 (CET)
Received: by zira.vinc17.org (Postfix, from userid 1000)
 id B6872280033C; Sun, 13 Mar 2022 02:41:45 +0100 (CET)
Date: Sun, 13 Mar 2022 02:41:45 +0100
From: Vincent Lefevre <vincent@vinc17.net>
Message-ID: <20220313014145.GF31771@zira.vinc17.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
X-Mailer-Info: https://www.vinc17.net/mutt/
User-Agent: Mutt/2.2.1+12 (1ba319cf) vl-138565 (2022-03-05)
Received-SPF: none client-ip=155.133.131.76; envelope-from=vincent@vinc17.net; 
 helo=joooj.vinc17.net
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001,
 SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Subject: [bug-diffutils] bug#54365: the .gitignore file is modified
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Mar 2022 01:42:02 -0000

The .gitignore file is modified as follows, possibly by the
bootstrap script:

diff --git a/.gitignore b/.gitignore
index 6735488..5b1afa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/build-aux
 *.a
 *.exe
 *.o

The .gitignore file already has "/build-aux/", so that the above
change is probably incorrect.

-- 
Vincent Lefèvre <vincent@vinc17.net> - Web: <https://www.vinc17.net/>
100% accessible validated (X)HTML - Blog: <https://www.vinc17.net/blog/>
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)




From MAILER-DAEMON Sat Mar 12 20:50:05 2022
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1nTDMx-0003fq-N0
	for mharc-bug-diffutils@gnu.org; Sat, 12 Mar 2022 20:50:04 -0500
Received: from eggs.gnu.org ([209.51.188.92]:51570)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1nTDMw-0003fh-5O
 for bug-diffutils@gnu.org; Sat, 12 Mar 2022 20:50:02 -0500
Received: from debbugs.gnu.org ([209.51.188.43]:47370)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1nTDMv-0000PK-R5
 for bug-diffutils@gnu.org; Sat, 12 Mar 2022 20:50:01 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1nTDMv-0008G2-Ne
 for bug-diffutils@gnu.org; Sat, 12 Mar 2022 20:50:01 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Vincent Lefevre <vincent@vinc17.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Sun, 13 Mar 2022 01:50:01 +0000
Resent-Message-ID: <handler.54366.B.164713616231679@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 54366
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 54366@debbugs.gnu.org
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.164713616231679
 (code B ref -1); Sun, 13 Mar 2022 01:50:01 +0000
Received: (at submit) by debbugs.gnu.org; 13 Mar 2022 01:49:22 +0000
Received: from localhost ([127.0.0.1]:41267 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1nTDMI-0008Es-Ic
 for submit@debbugs.gnu.org; Sat, 12 Mar 2022 20:49:22 -0500
Received: from lists.gnu.org ([209.51.188.17]:41364)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <vincent@vinc17.net>) id 1nTDMH-0008El-GQ
 for submit@debbugs.gnu.org; Sat, 12 Mar 2022 20:49:21 -0500
Received: from eggs.gnu.org ([209.51.188.92]:51480)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <vincent@vinc17.net>)
 id 1nTDMH-0003e9-4o
 for bug-diffutils@gnu.org; Sat, 12 Mar 2022 20:49:21 -0500
Received: from joooj.vinc17.net ([155.133.131.76]:37982)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <vincent@vinc17.net>)
 id 1nTDMF-0000M5-Nd
 for bug-diffutils@gnu.org; Sat, 12 Mar 2022 20:49:20 -0500
Received: from smtp-zira.vinc17.net (128.119.75.86.rev.sfr.net [86.75.119.128])
 by joooj.vinc17.net (Postfix) with ESMTPSA id 32F2229D;
 Sun, 13 Mar 2022 02:49:18 +0100 (CET)
Received: by zira.vinc17.org (Postfix, from userid 1000)
 id E93FE280033C; Sun, 13 Mar 2022 02:49:17 +0100 (CET)
Date: Sun, 13 Mar 2022 02:49:17 +0100
From: Vincent Lefevre <vincent@vinc17.net>
Message-ID: <20220313014917.GG31771@zira.vinc17.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="03/w0FnEpi05yyhA"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
X-Mailer-Info: https://www.vinc17.net/mutt/
User-Agent: Mutt/2.2.1+12 (1ba319cf) vl-138565 (2022-03-05)
Received-SPF: none client-ip=155.133.131.76; envelope-from=vincent@vinc17.net; 
 helo=joooj.vinc17.net
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001,
 SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Subject: [bug-diffutils] bug#54366: option -L is not documented in the "diff
 --help" output
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Mar 2022 01:50:02 -0000


--03/w0FnEpi05yyhA
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit

Option -L is not documented in the "diff --help" output (and
as a consequence, in the generated diff.1 man page either).

The doc/diffutils.info file contains

'-L LABEL'
'--label=LABEL'
     Use LABEL instead of the file name in the context format (*note
     Context Format::) and unified format (*note Unified Format::)
     headers.  *Note RCS::.

so "    --label LABEL" should just be changed to "-L, --label LABEL"
in src/diff.c. Patch attached.

-- 
Vincent Lefèvre <vincent@vinc17.net> - Web: <https://www.vinc17.net/>
100% accessible validated (X)HTML - Blog: <https://www.vinc17.net/blog/>
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)

--03/w0FnEpi05yyhA
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="diff.patch"

diff --git a/src/diff.c b/src/diff.c
index 1df3f41..b0bb29a 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -953,7 +953,7 @@ static char const * const option_help_msgid[] = {
   "",
   N_("-p, --show-c-function         show which C function each change is in"),
   N_("-F, --show-function-line=RE   show the most recent line matching RE"),
-  N_("    --label LABEL             use LABEL instead of file name and timestamp\n"
+  N_("-L, --label LABEL             use LABEL instead of file name and timestamp\n"
      "                                (can be repeated)"),
   "",
   N_("-t, --expand-tabs             expand tabs to spaces in output"),

--03/w0FnEpi05yyhA--




