Repository: yetus Updated Branches: refs/heads/master d36572c2a -> 22aaadf10
YETUS-725. shortcut qbt calcdiffs Signed-off-by: Allen Wittenauer <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/yetus/repo Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/22aaadf1 Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/22aaadf1 Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/22aaadf1 Branch: refs/heads/master Commit: 22aaadf10c4f9d22616612291a5a225641abf203 Parents: d36572c Author: Allen Wittenauer <[email protected]> Authored: Tue Nov 27 14:47:27 2018 -0800 Committer: Allen Wittenauer <[email protected]> Committed: Fri Nov 30 09:00:39 2018 -0800 ---------------------------------------------------------------------- precommit/src/main/shell/test-patch.sh | 31 ++++++++++++++++++----------- 1 file changed, 19 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/yetus/blob/22aaadf1/precommit/src/main/shell/test-patch.sh ---------------------------------------------------------------------- diff --git a/precommit/src/main/shell/test-patch.sh b/precommit/src/main/shell/test-patch.sh index 967c76b..7d9c363 100755 --- a/precommit/src/main/shell/test-patch.sh +++ b/precommit/src/main/shell/test-patch.sh @@ -2506,12 +2506,15 @@ function column_calcdiffs "${tmp}.branch" \ "${tmp}.patch" > "${tmp}.lined" - # now, pull out those lines of the raw output - # shellcheck disable=SC2013 - for j in $(cat "${tmp}.lined"); do - # shellcheck disable=SC2086 - head -${j} "${patch}" | tail -1 - done + if [[ "${BUILDMODE}" == full ]]; then + cat "${patch}" + else + # now, pull out those lines of the raw output + # shellcheck disable=SC2013 + for j in $(cat "${tmp}.lined"); do + head -"${j}" "${patch}" | tail -1 + done + fi rm "${tmp}.branch" "${tmp}.patch" "${tmp}.lined" 2>/dev/null } @@ -2547,12 +2550,16 @@ function error_calcdiffs "${tmp}.branch" \ "${tmp}.patch" > "${tmp}.lined" - # now, pull out those lines of the raw output - # shellcheck disable=SC2013 - for j in $(cat "${tmp}.lined"); do - # shellcheck disable=SC2086 - head -${j} "${patch}" | tail -1 - done + if [[ "${BUILDMODE}" == full ]]; then + cat "${patch}" + else + + # now, pull out those lines of the raw output + # shellcheck disable=SC2013 + for j in $(cat "${tmp}.lined"); do + head -"${j}" "${patch}" | tail -1 + done + fi rm "${tmp}.branch" "${tmp}.patch" "${tmp}.lined" 2>/dev/null }
