瀏覽代碼

Don't do a "git pull --rebase" before "git reset --hard"

Rebasing the old branch content doesn't make sense if we are
going to throw it away with a "git reset --hard" directly
afterwards. When rebasing the old branch content the process
could easily fail if the old patches didn't apply any longer.

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
Martin Storsjö 11 年之前
父節點
當前提交
b1e4595abd
共有 1 個文件被更改,包括 0 次插入2 次删除
  1. 0 2
      compileVLCforiOS.sh

+ 0 - 2
compileVLCforiOS.sh

@@ -139,7 +139,6 @@ git branch --set-upstream-to=origin/master localAspenBranch
 cd ..
 else
 cd MediaLibraryKit
-git pull --rebase
 git reset --hard ${TESTEDMEDIALIBRARYKITHASH}
 cd ..
 fi
@@ -152,7 +151,6 @@ git reset --hard ${TESTEDVLCKITHASH}
 cd ..
 else
 cd VLCKit
-git pull --rebase
 git reset --hard ${TESTEDVLCKITHASH}
 cd ..
 fi