From e0b49cb95286a62a4e615470c6d3fe841b433314 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Fri, 5 Jun 2020 01:53:38 +0200 Subject: [PATCH] Add .git-blame-ignore-revs with reformat commits This allows git blame to ignore reformatting changes and instead to show the previous commit that changed the line. To avoid manually building the list of commits this commit adds a file with a list of reformatting commits. I might have missed a few but this should be a good start. To use the file use: git blame --ignore-revs-file=.git-blame-ignore-revs file or to automatically always use the file git config blame.ignoreRevsFile .git-blame-ignore-revs Naming the file .git-blame-ignore-revs is a convention. Some more details in this random blog post: https://www.moxio.com/blog/43/ignoring-bulk-change-commits-with-git-blame Patch V2: Remove merge commit of the great formatting, add small reminder how to use the feature at the top of the file Signed-off-by: Arne Schwabe Acked-by: David Sommerseth Message-Id: <20200604235338.11728-1-arne@rfc2549.org> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg19967.html Signed-off-by: Gert Doering --- .git-blame-ignore-revs | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 000000000..6d9b374f9 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,39 @@ +# This FILE allows git blame to ignore reformatting changes and instead +# shows the previous commit that changed the line. +# +# To avoid manually building the list of commits this commit +# adds a file with a list of reformatting commits. TO use: +# +# git blame --ignore-revs-file=.git-blame-ignore-revs file +# +# or to automatically always use the file +# +# git config blame.ignoreRevsFile .git-blame-ignore-revs + + +# Uncrustify the tests/unit_tests/ part of our tree. +da1574ef7826d73f01e120cbd1ba40ce39a305b7 + +# Another round of uncrustify code cleanup. +9cf7b4925a54d93fbea1cadcf3dc0e11f3ce358f + +# networking_sitnl.c: uncrustify file +2c45d268ca65c522fbabb7c4dab5e721296b4623 + +# Uncrustify tapctl and openvpnmsica +6280d3d5536174934ee22d3840457d61896e0e3a + +# tun.c: uncrustify +baef44fc8769bbd99f4d699ce9f63180c29a5455 + +# networking_sitnl.c: uncrustify file +2c45d268ca65c522fbabb7c4dab5e721296b4623 + +# uncrustify openvpn sources +f57431cdc88f22fa4d7962946f0d3187fe058539 + +# More broadly enforce Allman style and braces-around-conditionals +4cd4899e8e80efae03c584a760fd107251735723 + +# The Great Reformatting - first phase +81d882d5302b8b647202a6893b57dfdc61fd6df2 -- 2.47.2