Skip to content

Commit

Permalink
added '-f' to the checkout flags for git
Browse files Browse the repository at this point in the history
  • Loading branch information
Brennon York committed Apr 9, 2015
1 parent 710c8d1 commit e3f63c7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion dev/run-tests-jenkins
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ COMMIT_URL="https://github.com/apache/spark/commit/${ghprbActualCommit}"
# GitHub doesn't auto-link short hashes when submitted via the API, unfortunately. :(
SHORT_COMMIT_HASH="${ghprbActualCommit:0:7}"

TESTS_TIMEOUT="150m" # format: http://linux.die.net/man/1/timeout
TESTS_TIMEOUT="120m" # format: http://linux.die.net/man/1/timeout

# Array to capture all tests to run on the pull request. These tests are held under the
#+ dev/tests/ directory.
Expand Down
6 changes: 3 additions & 3 deletions dev/tests/pr_new_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ CURR_CP_FILE="my-classpath.txt"
MASTER_CP_FILE="master-classpath.txt"

# First switch over to the master branch
git checkout master &>/dev/null
git checkout -f master &>/dev/null
# Find and copy all pom.xml files into a *.gate file that we can check
# against through various `git` changes
find -name "pom.xml" -exec cp {} {}.gate \;
# Switch back to the current PR
git checkout "${current_pr_head}" &>/dev/null
git checkout -f "${current_pr_head}" &>/dev/null

# Check if any *.pom files from the current branch are different from the master
difference_q=""
Expand All @@ -71,7 +71,7 @@ else
sort > ${CURR_CP_FILE}

# Checkout the master branch to compare against
git checkout master &>/dev/null
git checkout -f master &>/dev/null

${MVN_BIN} clean package dependency:build-classpath -DskipTests 2>/dev/null | \
sed -n -e '/Building Spark Project Assembly/,$p' | \
Expand Down

0 comments on commit e3f63c7

Please sign in to comment.