commit c15bbab9f3fbb5a0a76e51ccb3078d419dcdcac7 Author: Owen O'Malley Date: Sat May 14 21:07:29 2016 -0700 Update smart-apply-patch.sh diff --git testutils/ptest2/src/main/resources/smart-apply-patch.sh testutils/ptest2/src/main/resources/smart-apply-patch.sh old mode 100644 new mode 100755 index fce2735..5a133d5 --- testutils/ptest2/src/main/resources/smart-apply-patch.sh +++ testutils/ptest2/src/main/resources/smart-apply-patch.sh @@ -83,6 +83,9 @@ elif $PATCH -p1 -E --dry-run < $PATCH_FILE 2>&1 > /dev/null; then PLEVEL=1 elif $PATCH -p2 -E --dry-run < $PATCH_FILE 2>&1 > /dev/null; then PLEVEL=2 +elif git apply -p0 --check $PATCH_FILE 2>&1 > /dev/null; then + git apply -p0 $PATCH_FILE + cleanup $? else echo "The patch does not appear to apply with p0, p1, or p2"; cleanup 1;