hive git commit: HIVE-13763 : Update smart-apply-patch.sh with ability to use patches from git (Owen Omalley via Alan Gates)"

[ha...@apache.org]

Repository: hive
Updated Branches:
  refs/heads/master 066704f7e -> 0bdaeba6c


HIVE-13763 : Update smart-apply-patch.sh with ability to use patches from git (Owen Omalley via Alan Gates)"

Signed-off-by: Ashutosh Chauhan <ha...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/0bdaeba6
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/0bdaeba6
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/0bdaeba6

Branch: refs/heads/master
Commit: 0bdaeba6cb818ec8c004785f0e314c35f7adfe3b
Parents: 066704f
Author: Owen O'Malley <om...@apache.org>
Authored: Sat May 14 21:07:29 2016 -0700
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Sun Jul 10 11:05:26 2016 -0700

----------------------------------------------------------------------
 testutils/ptest2/src/main/resources/smart-apply-patch.sh | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/0bdaeba6/testutils/ptest2/src/main/resources/smart-apply-patch.sh
----------------------------------------------------------------------
diff --git a/testutils/ptest2/src/main/resources/smart-apply-patch.sh b/testutils/ptest2/src/main/resources/smart-apply-patch.sh
index fce2735..5a133d5 100644
--- a/testutils/ptest2/src/main/resources/smart-apply-patch.sh
+++ b/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;