Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10926: Improve test-patch.sh to apply binary diffs: fix typo

This commit is contained in:
Colin Patrick Mccabe 2014-10-30 17:54:05 -07:00
parent a9331fe9b0
commit e1f7d654e5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev-support/smart-apply-patch.sh
View File

@ -73,8 +73,8 @@ fi
# Special case for git-diff patches without --no-prefix # Special case for git-diff patches without --no-prefix
if is_git_diff_with_prefix "$PATCH_FILE"; then if is_git_diff_with_prefix "$PATCH_FILE"; then
GIT_FLAGS="--binary -p1 -v --stat --apply" GIT_FLAGS="--binary -p1 -v --stat"
[[ -n $DRY_RUN ]] && GIT_FLAGS="$GIT_FLAGS --dry-run " [[ -n $DRY_RUN ]] || GIT_FLAGS="$GIT_FLAGS --apply "
echo Going to apply git patch with: git apply "${GIT_FLAGS}" echo Going to apply git patch with: git apply "${GIT_FLAGS}"
git apply ${GIT_FLAGS} "${PATCH_FILE}" git apply ${GIT_FLAGS} "${PATCH_FILE}"
exit $? exit $?