[hive] branch master updated: HIVE-21416: Log git apply tries with p0, p1, and p2 (Miklos Gergely via Ashutosh Chauhan)

[kg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kgyrtkirk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new 73791e6  HIVE-21416: Log git apply tries with p0, p1, and p2 (Miklos Gergely via Ashutosh Chauhan)
73791e6 is described below

commit 73791e68a4573b67625f8582987c8eecafd77d2b
Author: Miklos Gergely <mg...@hortonworks.com>
AuthorDate: Mon Mar 11 16:18:44 2019 +0100

    HIVE-21416: Log git apply tries with p0, p1, and p2 (Miklos Gergely via Ashutosh Chauhan)
    
    Signed-off-by: Zoltan Haindrich <ki...@rxd.hu>
---
 testutils/ptest2/src/main/resources/smart-apply-patch.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/testutils/ptest2/src/main/resources/smart-apply-patch.sh b/testutils/ptest2/src/main/resources/smart-apply-patch.sh
index b70eb86..604de80 100644
--- a/testutils/ptest2/src/main/resources/smart-apply-patch.sh
+++ b/testutils/ptest2/src/main/resources/smart-apply-patch.sh
@@ -35,7 +35,7 @@ if [ "$PATCH_FILE" == "-" ]; then
   TOCLEAN="$TOCLEAN $PATCH_FILE"
 fi
 
-if git apply -p0 -3 --check $PATCH_FILE 2>&1 > /dev/null; then
+if echo "Trying to apply the patch with -p0"; git apply -p0 -3 --check $PATCH_FILE 2>&1 > /dev/null; then
   PLEVEL=0
 
   # if the patch applied at P0 there is the possibility that all we are doing
@@ -74,9 +74,9 @@ if git apply -p0 -3 --check $PATCH_FILE 2>&1 > /dev/null; then
     fi
 
   fi
-elif git apply -p1 -3 --check $PATCH_FILE 2>&1 > /dev/null; then
+elif echo "Trying to apply the patch with -p1"; git apply -p1 -3 --check $PATCH_FILE 2>&1 > /dev/null; then
   PLEVEL=1
-elif git apply -p2 -3 --check $PATCH_FILE 2>&1 > /dev/null; then
+elif echo "Trying to apply the patch with -p2"; git apply -p2 -3 --check $PATCH_FILE 2>&1 > /dev/null; then
   PLEVEL=2
 else
   echo "The patch does not appear to apply with p0, p1, or p2";