No description
3099633675
_gitUpdate() used to call 'git pull' then 'git checkout'. If the latter
command really did a branch switch, this could leave the local branch
behind its remote counterpart (that was hopefully fetched by the
'git pull'). From now on, we do:
git fetch origin
git checkout --force "$branch"
git pull --rebase
(the --force option was already there before in the form of -f). This
way, we can be sure that the local branch we check out is up-to-date
when the function returns.
Also replace short options by long ones for better readability of the
code, and use Bash's [[ ... ]] conditional construct instead of [ ... ]
for more efficiency---I think.
Note: 'git stash save' is documented as deprecated in favor of
'git stash push', however the latter appears to have been
introduced in 2017, therefore I believe it is too early to use it
in download_and_compile.sh.
|
||
|---|---|---|
| catalog | ||
| changes-in-dat-files/apt.dat | ||
| compile-scripts | ||
| fg-from-scratch | ||
| fgdata@5981eb11fc | ||
| fgrun@3fb3be1935 | ||
| flightgear@cbf1f3494a | ||
| getstart@4204eb38e7 | ||
| i18n | ||
| Nasa2FGearthview | ||
| python3-flightgear | ||
| release_builder | ||
| simgear@3075b8bcc4 | ||
| windows-3rd-party@790648cd69 | ||
| .gitattributes | ||
| .gitignore | ||
| .gitmodules | ||
| build_release_linux.sh | ||
| build_release_mac.sh | ||
| build_release_windows.bat | ||
| CMakeLists.txt | ||
| create_metar_dat.py | ||
| download_and_compile.sh | ||
| fgdata_checkers.py | ||
| FlightGear.iss | ||
| hudson_mac_build_release.sh | ||
| hudson_mac_package_release.rb | ||
| Info.plist.in | ||
| installWinDeps.bat | ||
| post_upload.py | ||
| sentry-dSYM-upload-mac.sh | ||
| update_git_mirror.sh | ||
| version | ||
| webhooks.xml | ||