Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature start from release #169

Closed
wants to merge 6 commits into from
Closed

Feature start from release #169

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91d847a
[twgit] Init feature 'feature-start-from-release'.
jcorre-hipay Feb 9, 2017
a80c41a
fix duplicated message when alerting on old branch
jcorre-hipay Feb 9, 2017
4738aac
fix the disparition of the quotes between items when displaying a lis…
jcorre-hipay Feb 9, 2017
7b1ba8f
improve bash completion
jcorre-hipay Feb 9, 2017
a746c76
fix wordings
jcorre-hipay Feb 9, 2017
cd350b0
Add 'from-release' to 'demo start' and 'feature start'
jcorre-hipay Feb 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions inc/common.inc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,7 +1228,6 @@ function alert_old_branch () {
msg="${msg} not merged into this branch:"
[ "$nb_tags_no_merged" -eq "$TWGIT_MAX_RETRIEVE_TAGS_NOT_MERGED" ] && msg="${msg} at least"
msg="${msg} $(displayInterval "$tags_not_merged")."
[ "$2" = 'with-help' ] && msg="${msg} If need be: git merge --no-ff $(get_last_tag) && twgit feature push"
[ "$2" = 'with-help' ] && msg="${msg} If need be: git merge --no-ff $(get_last_tag) && git push $TWGIT_ORIGIN $branch"
CUI_displayMsg warning "$msg"
fi
Expand Down Expand Up @@ -1293,7 +1292,7 @@ function displayQuotedEnum () {
if [ -z "$trimmed_list" ]; then
echo
else
local quoted_list="'<b>${trimmed_list// /</b>', '<b>}</b>'"
local quoted_list="'<b>${trimmed_list// /</b>\', \'<b>}</b>'"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I don't understand the reason. And these escaped quotes failed unit tests: https://travis-ci.org/Twenga/twgit/builds/205628394#L166

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have counter-commit this line to pass the rest of the pull request.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, maybe this point needs more investigations. In my environment, the tests don't pass because the quotes disappear. For example, a twgit feature list prints:

/!\ Following branches are out of process: 'origin/rm-1, origin/rm-2, origin/rm-3'!

I am on Ubuntu 16.04 with bash version 4.3.46(1)-release (x86_64-pc-linux-gnu).

echo $quoted_list
fi
}
Expand Down