From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 EFAA21DFDB3; Wed, 6 Nov 2024 13:02:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730898148; cv=none; b=MjdCMXLQCvNDYZglEwF09t9o4EJ/LR5hEDZhnurETGoKBdM455HVAWrX4stlfDbqDZz5KvgBsGRxGZleVBKvMMwMGN8LqAGB4VdOthE/sXNwydJrMuvziCoRhehdakAyE2KdJCce5YyQLyigR0JUmA75VqL/ShPpLKWbbxFG8J4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730898148; c=relaxed/simple; bh=40abHjfCYJ9Rv4jcibnzl7A6IEj6thxkemUgpPk0qMg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ULGJ+54LpHBB1CTKZwA9Ip5IQ2Lhk7Zp7FjDB8mUiRW0zjqbsoUsbSNWjoRKRj5960bZ6N7C9NpDyong2xju9/cgDhC70vJT6h0L6VCI/pY8otVC2sjnIj2AEaJBOoeXxV8nHAHtb5Z9Q99QKZYzTvm7tJ0ZGgYx2+KaDpjwfV0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0aZCNz5y; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="0aZCNz5y" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A81DC4CECD; Wed, 6 Nov 2024 13:02:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730898147; bh=40abHjfCYJ9Rv4jcibnzl7A6IEj6thxkemUgpPk0qMg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0aZCNz5yBrVDmg/2jZzfE0cZVAPjEotrs+Rt9ryG53KbXtYO3Rb32byzO6uLIw2+d 8QDVaFdw8Rr8RCxpN4U7Nq45ypxIpWEgQu+sSPRHGereiCNgq5yo6oNG0Q5NMNmFaY ZT4hJkvrAFuLAzfRy1LVko4qSfCatTxVcNgp+q54= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Laurent Pinchart , Masahiro Yamada Subject: [PATCH 5.4 139/462] Remove *.orig pattern from .gitignore Date: Wed, 6 Nov 2024 13:00:32 +0100 Message-ID: <20241106120334.942462901@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106120331.497003148@linuxfoundation.org> References: <20241106120331.497003148@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Laurent Pinchart commit 76be4f5a784533c71afbbb1b8f2963ef9e2ee258 upstream. Commit 3f1b0e1f2875 (".gitignore update") added *.orig and *.rej patterns to .gitignore in v2.6.23. The commit message didn't give a rationale. Later on, commit 1f5d3a6b6532 ("Remove *.rej pattern from .gitignore") removed the *.rej pattern in v2.6.26, on the rationale that *.rej files indicated something went really wrong and should not be ignored. The *.rej files are now shown by `git status`, which helps located conflicts when applying patches and lowers the probability that they will go unnoticed. It is however still easy to overlook the *.orig files which slowly polute the source tree. That's not as big of a deal as not noticing a conflict, but it's still not nice. Drop the *.orig pattern from .gitignore to avoid this and help keep the source tree clean. Signed-off-by: Laurent Pinchart [masahiroy@kernel.org: I do not have a strong opinion about this. Perhaps some people may have a different opinion. If you are someone who wants to ignore *.orig, it is likely you would want to do so across all projects. Then, $XDG_CONFIG_HOME/git/ignore would be more suitable for your needs. gitignore(5) suggests, "Patterns which a user wants Git to ignore in all situations generally go into a file specified by core.excludesFile in the user's ~/.gitconfig". Please note that you cannot do the opposite; if *.orig is ignored by the project's .gitignore, you cannot override the decision because $XDG_CONFIG_HOME/git/ignore has a lower priority. If *.orig is sitting on the fence, I'd leave it to the users. ] Signed-off-by: Masahiro Yamada Signed-off-by: Greg Kroah-Hartman --- .gitignore | 1 - 1 file changed, 1 deletion(-) --- a/.gitignore +++ b/.gitignore @@ -120,7 +120,6 @@ GTAGS # id-utils files ID -*.orig *~ \#*#