aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern A. Zeeb <bz@FreeBSD.org>2025-10-17 16:57:41 +0000
committerBjoern A. Zeeb <bz@FreeBSD.org>2025-10-19 23:24:25 +0000
commitaf445e1dd95d43c011f377ea6e6618637fecc61c (patch)
tree2940249e6b0eff293ffd21938fb74d7058902820
parentcb36bfee25b71d1223b8fb1237fcf823d514b50e (diff)
-rwxr-xr-xtools/tools/git/mfc-candidates.lua8
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/tools/git/mfc-candidates.lua b/tools/tools/git/mfc-candidates.lua
index a1420dc726da..cbf7dcb3a257 100755
--- a/tools/tools/git/mfc-candidates.lua
+++ b/tools/tools/git/mfc-candidates.lua
@@ -117,7 +117,7 @@ end
local function usage(from_branch, to_branch, author)
local script_name = arg[0]:match("([^/]+)$")
- print(script_name .. " [-ah] [-f from_branch] [-t to_branch] [-u user] [-X exclude_file] [path ...]")
+ print(script_name .. " [-ah] [-F git-show-fmt] [-f from_branch] [-t to_branch] [-u user] [-X exclude_file] [path ...]")
print()
params(from_branch, to_branch, author)
end
@@ -162,6 +162,7 @@ local function main()
local do_help = false
local exclude_file = nil
+ local gitshowfmt = '%h %s'
local i = 1
while i <= #arg and arg[i] do
local opt = arg[i]
@@ -181,6 +182,9 @@ local function main()
i = i + 1
elseif opt == "-v" then
verbose = verbose + 1
+ elseif opt == "-F" then
+ gitshowfmt = arg[i + 1]
+ i = i + 1
elseif opt == "-X" then
exclude_file = arg[i + 1]
i = i + 1
@@ -217,7 +221,7 @@ local function main()
-- Print the result
for _, hash in ipairs(result_hashes) do
- print(exec_command("git show --pretty='%h %s' --no-patch " .. hash))
+ print(exec_command("git show --pretty='" .. gitshowfmt .. "' --no-patch " .. hash))
end
end