From 01d92285ef4402b188fa583d57f5d1a18c889d22 Mon Sep 17 00:00:00 2001 From: Cyan Date: Wed, 28 Dec 2022 12:43:35 +0000 Subject: feat(git): git_commits shows the current branch graph (#2288) Co-authored-by: Cyan Joeng --- lua/telescope/make_entry.lua | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'lua/telescope/make_entry.lua') diff --git a/lua/telescope/make_entry.lua b/lua/telescope/make_entry.lua index 3843e5d..2532997 100644 --- a/lua/telescope/make_entry.lua +++ b/lua/telescope/make_entry.lua @@ -431,17 +431,27 @@ function make_entry.gen_from_git_commits(opts) return nil end - local sha, msg = string.match(entry, "([^ ]+) (.+)") + local marker, sha, msg = string.match(entry, "([*\\/| ]+) +([0-9a-f]*) +(.*)") + + if not sha then + marker = entry + sha = "" + msg = "" + end if not msg then - sha = entry msg = "" end + marker, _ = string.gsub(marker, "\\", "+") + marker, _ = string.gsub(marker, "/", "-") + marker, _ = string.gsub(marker, "+", "/") + marker, _ = string.gsub(marker, "-", "\\") + return make_entry.set_default_entry_mt({ value = sha, - ordinal = sha .. " " .. msg, - msg = msg, + ordinal = marker .. " " .. sha .. " " .. msg, + msg = marker .. " " .. msg, display = make_display, current_file = opts.current_file, }, opts) -- cgit v1.2.3