Skip to content

Commit

Permalink
Merge pull request #768 from bric3/fix-more-character-encoding-issues
Browse files Browse the repository at this point in the history
git-guilt: protect against encoding issues with LC_ALL=C
  • Loading branch information
spacewander committed Jul 19, 2019
2 parents 500ea2b + 2dc5d51 commit f258733
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions bin/git-guilt
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ do
test -n "$DEBUG" && echo "git blame $file"
# $1 - since $2 - until
git blame $NOT_WHITESPACE --line-porcelain "$1" -- "$file" 2> /dev/null |
sed -n "$PATTERN" | sort | uniq -c | sed 's/^\(.\)/- \1/' >> $MERGED_LOG
LC_ALL=C sed -n "$PATTERN" | sort | uniq -c | LC_ALL=C sed 's/^\(.\)/- \1/' >> $MERGED_LOG
# if $2 not given, use current commit as "until"
git blame $NOT_WHITESPACE --line-porcelain "${2-@}" -- "$file" 2> /dev/null |
sed -n "$PATTERN" | sort | uniq -c | sed 's/^\(.\)/+ \1/' >> $MERGED_LOG
LC_ALL=C sed -n "$PATTERN" | sort | uniq -c | LC_ALL=C sed 's/^\(.\)/+ \1/' >> $MERGED_LOG
done

DEBUG="$DEBUG" awk '
Expand Down

0 comments on commit f258733

Please sign in to comment.