You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2018/01/05 03:53:31 UTC
[1/2] trafodion git commit: [TRAFODION-2876] suppress the output of
color control code from command `git branch`
Repository: trafodion
Updated Branches:
refs/heads/master 7a5f3885d -> 33325b65c
[TRAFODION-2876] suppress the output of color control code from command `git
branch`
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/cc6292ba
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/cc6292ba
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/cc6292ba
Branch: refs/heads/master
Commit: cc6292ba4a10f43f65a18a6bb1344bb4e39ab526
Parents: 6be0b22
Author: wenjun.zhu <we...@esgyn.cn>
Authored: Thu Jan 4 11:41:28 2018 +0800
Committer: wenjun.zhu <we...@esgyn.cn>
Committed: Thu Jan 4 11:41:28 2018 +0800
----------------------------------------------------------------------
core/sqf/build-scripts/build.branch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/cc6292ba/core/sqf/build-scripts/build.branch
----------------------------------------------------------------------
diff --git a/core/sqf/build-scripts/build.branch b/core/sqf/build-scripts/build.branch
index 463475e..4b508cc 100755
--- a/core/sqf/build-scripts/build.branch
+++ b/core/sqf/build-scripts/build.branch
@@ -47,7 +47,7 @@ if [[ "$USE_GIT" == "1" ]];then
# runs make with a detached HEAD then change the space in "(no branch)"
# to an underscore so it can be used.
if [ -z "$ZUUL_BRANCH" ]; then
- branch=$(git branch | grep '^\* ' | sed 's/(no branch)/no_branch/' | awk '{print $2}')
+ branch=$(git branch --no-color| grep '^\* ' | sed 's/(no branch)/no_branch/' | awk '{print $2}')
else
branch=$ZUUL_BRANCH;
fi
[2/2] trafodion git commit: Merge [TRAFODION-2876] PR 1368 Suppress
output of color code
Posted by db...@apache.org.
Merge [TRAFODION-2876] PR 1368 Suppress output of color code
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/33325b65
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/33325b65
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/33325b65
Branch: refs/heads/master
Commit: 33325b65c429ae649cc1a78be42b8a1de71dfb4f
Parents: 7a5f388 cc6292b
Author: Dave Birdsall <db...@apache.org>
Authored: Fri Jan 5 03:52:15 2018 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Fri Jan 5 03:52:15 2018 +0000
----------------------------------------------------------------------
core/sqf/build-scripts/build.branch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------