From 119286ee5280757ba37985097f29337a3c8cf959 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Fri, 8 May 2020 09:46:17 -0400 Subject: build: reject merge conflict checkin attempts Although attempts to build code containing merge conflict markers USUALLY results in compile errors, this patch adds an explicit check for the conflict end marker. If for some unknown reason it's necessary to check in the text '>>>>>>>', construct it by concatenation: ">>>"">>>>" or '>>>' + '>>>>' depending on the language involved. Type: improvement Signed-off-by: Dave Barach Change-Id: Iaad2aa8b87a71137a3bb9a09f7f4159909bf79ab --- build-root/scripts/checkstyle.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build-root/scripts/checkstyle.sh b/build-root/scripts/checkstyle.sh index f2f118ca20d..58f67154114 100755 --- a/build-root/scripts/checkstyle.sh +++ b/build-root/scripts/checkstyle.sh @@ -72,6 +72,11 @@ cd ${VPP_DIR} git status for i in ${FILELIST}; do if [ -f ${i} ] && [ ${i} != "build-root/scripts/checkstyle.sh" ] && [ ${i} != "extras/emacs/fix-coding-style.el" ]; then + grep -q '>>>>>>>' ${i} + if [ $? == 0 ]; then + echo "Unresolved merge conflict detected in" ${i} "... Abort." + exit 1 + fi grep -q "fd.io coding-style-patch-verification: ON" ${i} if [ $? == 0 ]; then EXTENSION=`basename ${i} | sed 's/^\w\+.//'` -- cgit 1.2.3-korg