Clean upstream before merging to ensure clean state

2019-04-02 21:46:32 -04:00 · 2019-04-02 21:46:32 -04:00 · a32840b449
parent eb3be0ea5c
commit a32840b449
1 changed files with 1 additions and 1 deletions
--- a/scripts/upstreamMerge.sh
+++ b/scripts/upstreamMerge.sh
@ -9,7 +9,7 @@ gitcmd="git -c commit.gpgsign=false"

 function update {
    cd "$workdir/$1"
-    $gitcmd fetch && $gitcmd reset --hard origin/master
+    $gitcmd fetch && $gitcmd clean -fd && $gitcmd reset --hard origin/master
    cd ../
    $gitcmd add $1
 }