From 9bbf9b0541210a1fb6fe5b0040aa5ca1160b4883 Mon Sep 17 00:00:00 2001 From: Peter Kasting Date: Thu, 5 Sep 2024 16:31:34 +0000 Subject: [PATCH] Set blame.ignoreRevsFile to .git-blame-ignore-revs. This basically brings the functionality of git hyper-blame to git blame by default and is supported since git 2.23. Bug: none Change-Id: I2023669deac999ef31d0e094e79d7214168acb63 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5838110 Auto-Submit: Peter Kasting Reviewed-by: Josip Sokcevic Commit-Queue: Peter Kasting Reviewed-by: Gavin Mak --- gclient_scm.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gclient_scm.py b/gclient_scm.py index 47b0ddc4f..0b44253f8 100644 --- a/gclient_scm.py +++ b/gclient_scm.py @@ -671,9 +671,14 @@ class GitWrapper(SCMWrapper): # the cache to set and unset consecutively. config_updates = [] + if scm.GIT.GetConfig( + args[0].checkout_path, + 'blame.ignorerevsfile') != '.git-blame-ignore-revs': + config_updates.append( + ('blame.ignoreRevsFile', '.git-blame-ignore-revs')) + if scm.GIT.GetConfig(args[0].checkout_path, 'diff.ignoresubmodules') != 'dirty': - # If diff.ignoreSubmodules is not already set, set it to `all`. config_updates.append(('diff.ignoreSubmodules', 'dirty')) if scm.GIT.GetConfig(args[0].checkout_path,