You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cm...@apache.org on 2014/10/31 01:55:21 UTC
git commit: HADOOP-10926: Improve test-patch.sh to apply binary
diffs: fix typo
Repository: hadoop
Updated Branches:
refs/heads/trunk a9331fe9b -> e1f7d654e
HADOOP-10926: Improve test-patch.sh to apply binary diffs: fix typo
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e1f7d654
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e1f7d654
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e1f7d654
Branch: refs/heads/trunk
Commit: e1f7d654e561987fb9a89fe72bddd80bfe04e125
Parents: a9331fe
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Thu Oct 30 17:54:05 2014 -0700
Committer: Colin Patrick Mccabe <cm...@cloudera.com>
Committed: Thu Oct 30 17:54:05 2014 -0700
----------------------------------------------------------------------
dev-support/smart-apply-patch.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e1f7d654/dev-support/smart-apply-patch.sh
----------------------------------------------------------------------
diff --git a/dev-support/smart-apply-patch.sh b/dev-support/smart-apply-patch.sh
index f5c95e4..84ac566 100755
--- a/dev-support/smart-apply-patch.sh
+++ b/dev-support/smart-apply-patch.sh
@@ -73,8 +73,8 @@ 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 --apply"
- [[ -n $DRY_RUN ]] && GIT_FLAGS="$GIT_FLAGS --dry-run "
+ 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 $?