Bugfix to avoid errors due to Git subcommands returning ANSI color output.
diff --git a/gitflow-common b/gitflow-common
index 29ef388..f30cd5f 100644
--- a/gitflow-common
+++ b/gitflow-common
@@ -66,13 +66,13 @@
# Git specific common functionality
#
-git_local_branches() { git branch | sed 's/^[* ] //'; }
-git_remote_branches() { git branch -r | sed 's/^[* ] //'; }
-git_all_branches() { ( git branch; git branch -r) | sed 's/^[* ] //'; }
+git_local_branches() { git branch --color=never | sed 's/^[* ] //'; }
+git_remote_branches() { git branch -r --color=never | sed 's/^[* ] //'; }
+git_all_branches() { ( git branch --color=never; git branch -r --color=never) | sed 's/^[* ] //'; }
git_all_tags() { git tag; }
git_current_branch() {
- git branch | grep '^\* ' | grep -v 'no branch' | sed 's/^* //g'
+ git branch --color=never | grep '^\* ' | grep -v 'no branch' | sed 's/^* //g'
}
git_is_clean_working_tree() {
@@ -140,7 +140,7 @@
git_is_branch_merged_into() {
local subject=$1
local base=$2
- local all_merges=$(git branch --contains $subject | sed 's/^[* ] //')
+ local all_merges=$(git branch --color=never --contains $subject | sed 's/^[* ] //')
has $base $all_merges
}