From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.2 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org [IPv6:2604:1380:45e3:2400::1]) (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) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id F0AB01F4B8 for ; Tue, 23 Jan 2024 17:32:41 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; unprotected) header.d=pobox.com header.i=@pobox.com header.a=rsa-sha256 header.s=sasl header.b=ZeJhFiSn; dkim-atps=neutral Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 2ECC528D5DA for ; Tue, 23 Jan 2024 17:32:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0F5EA8002E; Tue, 23 Jan 2024 17:32:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b="ZeJhFiSn" Received: from pb-smtp20.pobox.com (pb-smtp20.pobox.com [173.228.157.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 740665F555 for ; Tue, 23 Jan 2024 17:32:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=173.228.157.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706031151; cv=none; b=dPZOKPzMLEw0CCwGuHk0qR6g0dcIl2b8/MV7DEsmvdQcMYwOuq09ncQnpz9UzpRsS1Cfqxcte6iUb/GhrWrVPc8UtarxgOtJDvhGv7SpNEPYst6RfOQGLiPGxeY35jvq936fXpJCrj4GtCr+SRGGxLI8tNT6FFOM9ZBRaoVkk7c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706031151; c=relaxed/simple; bh=7qiJSXnxaC1mK/2uwF2LNkD2o3pFShMkb+EcLCPezbw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=n3++5Fa1griCnhn0aQmaqBjZ1uuLBuUpNQXXK4JFHVBKgYze8wCuGf1jXVIDvlvqnohgisWLkZna+YLcyEDc7mDvIxG9qQ7mL7U2aAQMjDoz1AifSeKrS3MycjaRo+QNyWicuxE1Tw4CotG2/n5QUQGKsyaCjt1Zb6xdsPM6AkI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com; spf=pass smtp.mailfrom=pobox.com; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b=ZeJhFiSn; arc=none smtp.client-ip=173.228.157.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pobox.com Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 96B6E1B1DB; Tue, 23 Jan 2024 12:32:29 -0500 (EST) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:in-reply-to:references:date:message-id:mime-version :content-type; s=sasl; bh=7qiJSXnxaC1mK/2uwF2LNkD2o3pFShMkb+EcLC Pezbw=; b=ZeJhFiSnbmX7RVRDFXUr3JaywKNlm20KZA8UJop/WJWh+Zb6i9/8d3 D9uOTRpcACFnFtWQK6qyjfQKCO+sBQBVEiTDCQr92wD3De3MPemvKq+BV/zn/MuO vRt3T3ApN/KKGOWEti6G6sJYu8nAhtcNLV0o1RMF3zY7+EkzacPs8= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 8F25B1B1DA; Tue, 23 Jan 2024 12:32:29 -0500 (EST) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.125.200.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 28DB91B1D9; Tue, 23 Jan 2024 12:32:26 -0500 (EST) (envelope-from junio@pobox.com) From: Junio C Hamano To: Brian Lyles Cc: Kristoffer Haugsbakk , Taylor Blau , Elijah Newren , git@vger.kernel.org Subject: Re: [PATCH 4/4] cherry-pick: Add `--empty` for more robust redundant commit handling In-Reply-To: (Brian Lyles's message of "Mon, 22 Jan 2024 23:23:17 -0600") References: <20240119060721.3734775-2-brianmlyles@gmail.com> <20240119060721.3734775-5-brianmlyles@gmail.com> <06eb93d7-7113-4583-9860-28a6a6d528a2@app.fastmail.com> <10838549-c364-429b-a086-68a41b7369de@app.fastmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Tue, 23 Jan 2024 09:32:24 -0800 Message-ID: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 5FF1E1A8-BA15-11EE-972C-F515D2CDFF5E-77302942!pb-smtp20.pobox.com Brian Lyles writes: > I do see that there are ~130 files with trailing whitespace in maint > today, though I suspect that most of those are not intentional. I got curious and took a look at files that has hits with "lines that end with SP or HT": $ git grep -l -e '[ ]$' There are some that can be cleaned up, but many of them are intentional. For example, CODE_OF_CONDUCT.md has these two (shown with $$$) I think can be removed without breaking markdown: Community Impact Guidelines were inspired by $$$ [Mozilla's code of conduct enforcement ladder][Mozilla CoC]. For answers to common questions about this code of conduct, see the FAQ at [https://www.contributor-covenant.org/faq][FAQ]. Translations are available $$$ at [https://www.contributor-covenant.org/translations][translations]. The one in Documentation/user-manual.txt is on borderline. They appear in a sample output from a command the user is typing (again, $$$ shows where the SP at the end of line is): diff --git a/init-db.c b/init-db.c index 65898fa..b002dc6 100644 --- a/init-db.c +++ b/init-db.c @@ -7,7 +7,7 @@ $$$ int main(int argc, char **argv) ... As its purpose is to show human readers what they see in their terminal should _look_ like, we _could_ do without the single space on these otherwise empty lines, which denotes an empty line that hasn't changed in the diff output. But it would no longer match byte-for-byte with what we are trying to illustrate. There are many hits from the above grep in t/t[0-9][0-9][0-9][0-9]/ directories; these are canonical/expected output used in tests and the spaces at the end of these lines are expected.