diff options
author | Amit Kucheria <amit.kucheria@linaro.org> | 2018-07-18 16:18:55 +0530 |
---|---|---|
committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2018-08-29 12:06:12 +0200 |
commit | 820c8f7aaa9cee701dd65db5d43c4e491980971c (patch) | |
tree | 67d3b0499b7d6166a8209b1a47fa5f2a784d48aa | |
parent | 389d388f34a289484418cb52f623940da9fe355e (diff) |
ci-merge: fix messages, grammar
Random bunch of fixes to make the output a bit nicer to read
Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
-rwxr-xr-x | ci-merge | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -491,7 +491,7 @@ do_remove_old() { do_add_new() { - echo "Adding all remotes new ..." + echo "Adding new remotes..." ADDED=0 @@ -610,11 +610,10 @@ fi TAG=$(get_last_change_id) echo "Latest tag is $TAG" -echo "Check the 'integration' branch exists" git branch | grep -q "$INTEG_BRANCH$" if [ $? -eq 0 ]; then - echo "The integration branch already exists." + echo "The integration branch ($INTEG_BRANCH) already exists." INTEG_BRANCH_NEW_NAME=$INTEG_BRANCH-$(date +%Y%m%d-%H%M%S)-$(git describe) @@ -650,7 +649,8 @@ while read LINE; do MERGER="$REMOTE_NAME/$REMOTE_BRANCH" fi - echo "----------------------\nMerging $MERGER" + echo "------------------------------------------" + echo " ** Merging topic branch: $MERGER" git merge -q --no-ff --no-edit $MERGER if [ $? -ne 0 ]; then |