Skip to content

Commit

Permalink
Revert "feat(git): git_commits shows the current branch graph (#2288)" (
Browse files Browse the repository at this point in the history
#2358)

This reverts commit 01d9228.
  • Loading branch information
Conni2461 authored Jan 31, 2023
1 parent f4b0438 commit 203bf56
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 16 deletions.
5 changes: 3 additions & 2 deletions lua/telescope/builtin/__git.lua
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ end

git.commits = function(opts)
opts.entry_maker = vim.F.if_nil(opts.entry_maker, make_entry.gen_from_git_commits(opts))
local git_command = vim.F.if_nil(opts.git_command, { "git", "log", "--graph", "--oneline", "--decorate", "--", "." })
local git_command = vim.F.if_nil(opts.git_command, { "git", "log", "--pretty=oneline", "--abbrev-commit", "--", "." })

pickers
.new(opts, {
Expand Down Expand Up @@ -115,7 +115,8 @@ git.bcommits = function(opts)
opts.current_line = (opts.current_file == nil) and get_current_buf_line(opts.winnr) or nil
opts.current_file = vim.F.if_nil(opts.current_file, vim.api.nvim_buf_get_name(opts.bufnr))
opts.entry_maker = vim.F.if_nil(opts.entry_maker, make_entry.gen_from_git_commits(opts))
local git_command = vim.F.if_nil(opts.git_command, { "git", "log", "--graph", "--oneline", "--decorate", "--follow" })
local git_command =
vim.F.if_nil(opts.git_command, { "git", "log", "--pretty=oneline", "--abbrev-commit", "--follow" })

pickers
.new(opts, {
Expand Down
18 changes: 4 additions & 14 deletions lua/telescope/make_entry.lua
Original file line number Diff line number Diff line change
Expand Up @@ -430,27 +430,17 @@ function make_entry.gen_from_git_commits(opts)
return nil
end

local marker, sha, msg = string.match(entry, "([*\\/| ]+) +([0-9a-f]*) +(.*)")

if not sha then
marker = entry
sha = ""
msg = ""
end
local sha, msg = string.match(entry, "([^ ]+) (.+)")

if not msg then
sha = entry
msg = "<empty commit message>"
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 = marker .. " " .. sha .. " " .. msg,
msg = marker .. " " .. msg,
ordinal = sha .. " " .. msg,
msg = msg,
display = make_display,
current_file = opts.current_file,
}, opts)
Expand Down

0 comments on commit 203bf56

Please sign in to comment.