Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
build: reject merge conflict checkin attempts
[vpp.git]
/
build-root
/
scripts
/
checkstyle.sh
diff --git
a/build-root/scripts/checkstyle.sh
b/build-root/scripts/checkstyle.sh
index
f2f118c
..
58f6715
100755
(executable)
--- 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
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\+.//'`
grep -q "fd.io coding-style-patch-verification: ON" ${i}
if [ $? == 0 ]; then
EXTENSION=`basename ${i} | sed 's/^\w\+.//'`