emileclarkb/fork-g
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: 'g branches' on OSX

Browse source
This commit is contained in:
William Hilton 2019-04-05 15:24:01 -04:00
parent fd88c58e90
commit 8d9d0bfd42
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bin/g
View file

@ -268,9 +268,9 @@ git branch --merged | sed 's/^..//' > "$TEMP/merged.branches"
# Pretty-print local branches # Pretty-print local branches
git for-each-ref --sort=-committerdate refs/heads \ git for-each-ref --sort=-committerdate refs/heads \
--format='%(HEAD) %(color:green)%(committerdate:relative)%(color:reset)|%(color:red)%(objectname:short)%(color:reset)|%(color:yellow)%(refname:short)%(color:reset) -> %(upstream:short)' > "$TEMP/local.branches" --format='%(HEAD) %(color:green)%(committerdate:relative)%(color:reset)|%(color:red)%(objectname:short)%(color:reset)|%(color:yellow)%(refname:short)%(color:reset) -> %(upstream:short)' > "$TEMP/local.branches"
sed -i 's/ -> $/ -> \?/g' "$TEMP/local.branches" sed -i'' -e 's/ -> $/ -> \?/g' "$TEMP/local.branches"
while read -r branch; do while read -r branch; do
sed -i "s~${branch}\b.*~\0|(merged)~" "$TEMP/local.branches" sed -i'' -e 's~'${branch}'[[:>:]].*~&|(merged)~' "$TEMP/local.branches"
done < "$TEMP/merged.branches" done < "$TEMP/merged.branches"
# Pretty-print remote branches # Pretty-print remote branches
git for-each-ref --sort=-committerdate refs/remotes \ git for-each-ref --sort=-committerdate refs/remotes \