Skip to content

Commit

Permalink
we use "git clean -d -x -f" to cleanup the local git working copy bef…
Browse files Browse the repository at this point in the history
…ore doing a fresh pull.
  • Loading branch information
jens-maus committed Oct 27, 2016
1 parent 24e790f commit e26efa9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion www/nightly.yam.ch/yam-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ fi

# undo all possible local changes to the local working copy so that
# we won't get any conflicts.
$(cd ${MODULE}; ${GIT} checkout . 2>&1 >/dev/null)
$(cd ${MODULE}; ${GIT} clean -d -x -f 2>&1 >/dev/null)

# now pull changes
output=`cd ${MODULE}; ${GIT} pull 2>&1 | egrep "^Updating .{7}\.\..{7}" | cut -d' ' -f2`
Expand Down

0 comments on commit e26efa9

Please sign in to comment.