| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 20:45:18 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 20:50:49 (GMT) |
| commit | a8fe8d4fe9868b11bf6417e4b9b6b3e50d637b69 (patch) | |
| tree | a5e6b2cffa6fd65fef129aac095bf33265af6229 | |
| parent | 0460b9bb3e34472223084a6c3ad35b4ded9c276b (diff) | |
| parent | 9510d7689e236f6a4748795604fba427c130d0ad (diff) | |
| download | ffmpeg-a8fe8d4fe9868b11bf6417e4b9b6b3e50d637b69.zip ffmpeg-a8fe8d4fe9868b11bf6417e4b9b6b3e50d637b69.tar.gz ffmpeg-a8fe8d4fe9868b11bf6417e4b9b6b3e50d637b69.tar.bz2 | |
Merge commit '9510d7689e236f6a4748795604fba427c130d0ad'
* commit '9510d7689e236f6a4748795604fba427c130d0ad':
fate.sh: Allow non-fast-forwards when updating sources
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | tests/fate.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate.sh b/tests/fate.sh index c474be7..69dcdd6 100755 --- a/tests/fate.sh +++ b/tests/fate.sh @@ -35,7 +35,7 @@ checkout(){ update()( cd ${src} || return case "$repo" in - git:*) git pull --quiet ;; + git:*) git fetch --force; git reset --hard origin/master ;; esac ) |