From 233aaf156fe647c738e11e415d7aba2cb7980f3f Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 18 Jul 2022 13:53:14 +0100 Subject: [PATCH 1/5] Prevent another black run from appearing in blame results --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 50d28c68eeb8..bc5dd6dc410e 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,3 +1,6 @@ +# Run black (#3679). +8b3d9b6b199abb87246f982d5db356f1966db925 + # Black reformatting (#5482). 32e7c9e7f20b57dd081023ac42d6931a8da9b3a3 From c3c5064a0af93087fb699c8d667cb9c675f26cb5 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 18 Jul 2022 13:58:02 +0100 Subject: [PATCH 2/5] changelog --- changelog.d/13311.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/13311.misc diff --git a/changelog.d/13311.misc b/changelog.d/13311.misc new file mode 100644 index 000000000000..4be81c675c30 --- /dev/null +++ b/changelog.d/13311.misc @@ -0,0 +1 @@ +Prevent formatting changes of [#3679](https://github.com/matrix-org/synapse/pull/3679) from appearing in `git blame`. \ No newline at end of file From 72d14e9a7d00ff0d961ca1dbf6edbde4b07739e5 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 18 Jul 2022 13:58:18 +0100 Subject: [PATCH 3/5] Add a001038b92c4f0082cad60e5e87d0bd01374c9de as well --- .git-blame-ignore-revs | 1 + 1 file changed, 1 insertion(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index bc5dd6dc410e..5bc7d0d04a0e 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,5 +1,6 @@ # Run black (#3679). 8b3d9b6b199abb87246f982d5db356f1966db925 +a001038b92c4f0082cad60e5e87d0bd01374c9de # Black reformatting (#5482). 32e7c9e7f20b57dd081023ac42d6931a8da9b3a3 From 7d6294a18351501dfcae789643c37b55b768babf Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 18 Jul 2022 14:23:18 +0100 Subject: [PATCH 4/5] Remove second commit; add docs to .git-blame-ignore-revs --- .git-blame-ignore-revs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 5bc7d0d04a0e..2cd72d78c7c0 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,6 +1,13 @@ +# Commits in this file will be removed from GitHub blame results. +# +# To use this file locally, use: +# git blame --ignore-revs-file="path/to/.git-blame-ignore-revs" +# +# If ignoring a pull request that was not squash merged, only the merge +# commit needs to be put here. Child commits will be resolved from it. + # Run black (#3679). 8b3d9b6b199abb87246f982d5db356f1966db925 -a001038b92c4f0082cad60e5e87d0bd01374c9de # Black reformatting (#5482). 32e7c9e7f20b57dd081023ac42d6931a8da9b3a3 From 60c70f17ec5984fc89dabde9debd1064dc75522b Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 18 Jul 2022 14:29:38 +0100 Subject: [PATCH 5/5] Mention blame.ignoreRevsFile --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 2cd72d78c7c0..c3638c35eb14 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -3,6 +3,8 @@ # To use this file locally, use: # git blame --ignore-revs-file="path/to/.git-blame-ignore-revs" # +# or configure the `blame.ignoreRevsFile` option in your git config. +# # If ignoring a pull request that was not squash merged, only the merge # commit needs to be put here. Child commits will be resolved from it.