HADOOP-11994. smart-apply-patch wrongly assumes that git is infallible. (Contributed by Kengo Seki)

dev-support/smart-apply-patch.sh

@@ -101,7 +101,10 @@ if grep -q "^diff --git" "${PATCH_FILE}"; then
   fi
   # shellcheck disable=SC2086
   git apply ${GIT_FLAGS} "${PATCH_FILE}"
-  exit $?
+  if [[ $? == 0 ]]; then
+    cleanup 0
+  fi
+  echo "git apply failed. Going to apply the patch with: ${PATCH}"
 fi
 
 # Come up with a list of changed files into $TMP

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -820,6 +820,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-12019. update BUILDING.txt to include python for 'mvn site'
     in windows (vinayakumarb)
 
+    HADOOP-11994. smart-apply-patch wrongly assumes that git is infallible.
+    (Kengo Seki via Arpit Agarwal)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES