Skip to content

prefix git conflict grep path with git repo root #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

prefix git conflict grep path with git repo root #327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion functions/geometry_git
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,17 @@ geometry_git_conflicts() {
local conflicts conflict_list
local file_count
local total raw_total
local git_root
conflicts=$(git diff --name-only --diff-filter=U -z 2>/dev/null)

[[ -z "$conflicts" ]] && return


_grep=${GEOMETRY_GIT_GREP:=${commands[rg]:=${commands[ag]:=${commands[grep]}}}}
conflict_list=$($_grep -cH '^=======$' ${(0)conflicts})

git_root=$(git rev-parse --show-toplevel)

conflict_list=$($_grep -cH '^=======$' ${git_root/$^conflicts})
Comment on lines +76 to +78
Copy link
Author

@turbocrime turbocrime Jul 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this expansion feels fragile, not sure of best practice here


file_count="${(w)#conflict_list}"

Expand Down