git commit: Revert "HADOOP-10926. Improve test-patch.sh to apply binary diffs (cmccabe)

[cm...@apache.org]

Repository: hadoop
Updated Branches:
  refs/heads/trunk e1f7d654e -> 4727064da


Revert "HADOOP-10926. Improve test-patch.sh to apply binary diffs (cmccabe)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4727064d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4727064d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4727064d

Branch: refs/heads/trunk
Commit: 4727064dab7eb2b126c9e24e9b55eea714304b15
Parents: e1f7d65
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Thu Oct 30 20:02:27 2014 -0700
Committer: Colin Patrick Mccabe <cm...@cloudera.com>
Committed: Thu Oct 30 20:02:27 2014 -0700

----------------------------------------------------------------------
 dev-support/smart-apply-patch.sh | 43 -----------------------------------
 1 file changed, 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/4727064d/dev-support/smart-apply-patch.sh
----------------------------------------------------------------------
diff --git a/dev-support/smart-apply-patch.sh b/dev-support/smart-apply-patch.sh
index 84ac566..49f083c 100755
--- a/dev-support/smart-apply-patch.sh
+++ b/dev-support/smart-apply-patch.sh
@@ -13,40 +13,6 @@
 
 set -e
 
-#
-# Determine if the patch file is a git diff file with prefixes.
-# These files are generated via "git diff" *without* the --no-prefix option.
-#
-# We can apply these patches more easily because we know that the a/ and b/
-# prefixes in the "diff" lines stands for the project root directory.
-# So we don't have to hunt for the project root.
-# And of course, we know that the patch file was generated using git, so we
-# know git apply can handle it properly.
-#
-# Arguments: file name.
-# Return: 0 if it is a git diff; 1 otherwise.
-#
-is_git_diff_with_prefix() {
-  DIFF_TYPE="unknown"
-  while read -r line; do
-    if [[ "$line" =~ ^diff\  ]]; then
-      if [[ "$line" =~ ^diff\ \-\-git ]]; then
-        DIFF_TYPE="git"
-      else
-        return 1 # All diff lines must be diff --git lines.
-      fi
-    fi
-    if [[ "$line" =~ ^\+\+\+\  ]] ||
-       [[ "$line" =~ ^\-\-\-\  ]]; then
-      if ! [[ "$line" =~ ^....[ab]/ ]]; then
-        return 1 # All +++ and --- lines must start with a/ or b/.
-      fi
-    fi
-  done < $1
-  [ x$DIFF_TYPE == x"git" ] || return 1
-  return 0 # return true (= 0 in bash)
-}
-
 PATCH_FILE=$1
 DRY_RUN=$2
 if [ -z "$PATCH_FILE" ]; then
@@ -71,15 +37,6 @@ if [ "$PATCH_FILE" == "-" ]; then
   TOCLEAN="$TOCLEAN $PATCH_FILE"
 fi
 
-# Special case for git-diff patches without --no-prefix
-if is_git_diff_with_prefix "$PATCH_FILE"; then
-  GIT_FLAGS="--binary -p1 -v --stat"
-  [[ -n $DRY_RUN ]] || GIT_FLAGS="$GIT_FLAGS --apply "
-  echo Going to apply git patch with: git apply "${GIT_FLAGS}"
-  git apply ${GIT_FLAGS} "${PATCH_FILE}"
-  exit $?
-fi
-
 # Come up with a list of changed files into $TMP
 TMP=/tmp/tmp.paths.$$
 TOCLEAN="$TOCLEAN $TMP"