From f11be2c1a9aa34eff22c43d861f49c1790af004e Mon Sep 17 00:00:00 2001 From: druckdev Date: Mon, 15 Nov 2021 18:51:55 +0100 Subject: [PATCH] git:alias:track: Fix multiple branch filtering This fixes the deletion/filtering of branches if there were multiple local branches tracking the same remote branch. --- .config/git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/git/config b/.config/git/config index 474b0e0..d30807f 100644 --- a/.config/git/config +++ b/.config/git/config @@ -16,7 +16,7 @@ [alias] root = rev-parse --show-toplevel spull = "!__git_spull() { git pull \"$@\" && git submodule sync --recursive && git submodule update --init --recursive; }; __git_spull" - track = "!track() { git for-each-ref --format='%(upstream)%(if)%(upstream)%(then),%(end)%(refname)' refs/heads refs/remotes | sort -uk1,1 -t, | sed -E 's/(.*),(.*)/\\2,\\1/; s:(heads/[^,]*)$:\\1,:; s:^refs/remotes/:,:; s:refs/[^/]*/::g' | column -ts,; }; track" + track = "!track() { git for-each-ref --format='%(upstream)%(if)%(upstream)%(then),%(end)%(refname)' refs/heads refs/remotes | sort | sed -Ez 's:(refs/remotes/[^\\n]*)\\n\\1:\\1:g' | sed -E 's/(.*),(.*)/\\2,\\1/; s:(heads/[^,]*)$:\\1,:; s:^refs/remotes/:,:; s:refs/[^/]*/::g' | column -ts,; }; track" [status] submodulesummary = true [diff]