Permalink
Browse files

modified output of feature-status subcommand

  • Loading branch information...
1 parent 2a24e44 commit 2b8556a4b28d9750961ade5f2889d58cbaef70d9 @joemiller committed Feb 26, 2012
Showing with 6 additions and 1 deletion.
  1. +6 −1 git-puppet-feature
View
@@ -140,16 +140,21 @@ cmd_status() {
# look for feature branches that have not been merged into
# environment branches yet.
+ echo
for environment in $environment_branches; do
environment_short_name=$(echo "$environment" | sed "s@^$ENVIRONMENT_PREFIX@@g")
- echo "Unmerged feature branches for environment '$environment_short_name':"
+ echo "Feature branches not yet merged into environment '$environment_short_name':"
+ # echo "Unmerged feature branches for environment '$environment_short_name':"
unmerged=$(git branch --no-merged $environment | sed 's/^[* ] //' | grep "^$FEATURE_PREFIX")
for branch in $unmerged; do
short_name=$(echo "$branch" | sed "s@^$FEATURE_PREFIX@@g")
echo " $short_name"
done
echo
done
+ echo "-------------------"
+ echo "To merge a feature branch into an environment branch:"
+ echo " git puppet feature merge <name> <environment>"
}
cmd_help() {

0 comments on commit 2b8556a

Please sign in to comment.