From: Abhijeetsingh Meena <abhijeet040403@xxxxxxxxx>
git-blame(1) can ignore a list of commits with `--ignore-revs-file`.
This is useful for marking uninteresting commits like formatting
changes, refactors and whatever else should not be “blamed”. Some
projects even version control this file so that all contributors can
use it; the conventional name is `.git-blame-ignore-revs`.
But each user still has to opt-in to the standard ignore list,
either with this option or with the config `blame.ignoreRevsFile`.
Let’s teach git-blame(1) to respect this conventional file in order
to streamline the process.
Signed-off-by: Abhijeetsingh Meena <abhijeet040403@xxxxxxxxx>
---
builtin/blame.c | 8 ++++++++
t/t8015-blame-default-ignore-revs.sh | 26 ++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
create mode 100755 t/t8015-blame-default-ignore-revs.sh
diff --git a/builtin/blame.c b/builtin/blame.c
index e407a22da3b..1eddabaf60f 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -1105,6 +1105,14 @@ parse_done:
add_pending_object(&revs, &head_commit->object, "HEAD");
}
+ /*
+ * By default, add .git-blame-ignore-revs to the list of files
+ * containing revisions to ignore if it exists.
+ */
+ if (access(".git-blame-ignore-revs", F_OK) == 0) {
+ string_list_append(&ignore_revs_file_list, ".git-blame-ignore-revs");
+ }
+
init_scoreboard(&sb);
sb.revs = &revs;
sb.contents_from = contents_from;
diff --git a/t/t8015-blame-default-ignore-revs.sh b/t/t8015-blame-default-ignore-revs.sh
new file mode 100755
index 00000000000..d4ab686f14d
--- /dev/null
+++ b/t/t8015-blame-default-ignore-revs.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+test_description='default revisions to ignore when blaming'
+
+TEST_PASSES_SANITIZE_LEAK=true
+. ./test-lib.sh
+
+test_expect_success 'blame: default-ignore-revs-file' '
+ test_commit first-commit hello.txt hello &&
+
+ echo world >>hello.txt &&
+ test_commit second-commit hello.txt &&
+
+ sed "1s/hello/hi/" <hello.txt > hello.txt.tmp &&
+ mv hello.txt.tmp hello.txt &&
+ test_commit third-commit hello.txt &&
+
+ git rev-parse HEAD >ignored-file &&
+ git blame --ignore-revs-file=ignored-file hello.txt >expect &&
+ git rev-parse HEAD >.git-blame-ignore-revs &&
+ git blame hello.txt >actual &&
+
+ test_cmp expect actual
+'
+
+test_done
--
gitgitgadget
