Merge branch 'master' of git://github.com/ndbroadbent/scm_breeze

This commit is contained in:
Aljaž "g5pw" Srebrnič
2013-04-15 17:58:47 +02:00
13 changed files with 138 additions and 61 deletions

View File

@@ -217,10 +217,10 @@ _git_index_update_all_branches() {
# Ignore branch if remote and merge is not configured
if [[ -n "$remote" ]] && [[ -n "$merge" ]]; then
branches=("${branches[@]}" "$branch")
remotes=("${remotes[@]}" "$remote")
branches=(${branches[@]} "$branch")
remotes=(${remotes[@]} "$remote")
# Get branch from merge ref (refs/heads/master => master)
merges=("${merges[@]}" "$(basename $merge)")
merges=(${merges[@]} "$(basename $merge)")
else
echo "=== Skipping $branch: remote and merge refs are not configured."
fi