diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-08-07 10:25:09 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2020-09-10 11:39:30 -0400 |
| commit | 064f7241d8ea1608f509395bfeb4eb86ef631865 (patch) | |
| tree | 784e556b149dfb73f0de96ac366f345eb9e31ad2 | |
| parent | 98d445a0708e56a511fb91c6189dea97b0a57d43 (diff) | |
| download | meson-064f7241d8ea1608f509395bfeb4eb86ef631865.zip meson-064f7241d8ea1608f509395bfeb4eb86ef631865.tar.gz meson-064f7241d8ea1608f509395bfeb4eb86ef631865.tar.bz2 | |
msubprojects: Stash changes before checkout
| -rwxr-xr-x | mesonbuild/msubprojects.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesonbuild/msubprojects.py b/mesonbuild/msubprojects.py index f1cc515..22d155d 100755 --- a/mesonbuild/msubprojects.py +++ b/mesonbuild/msubprojects.py @@ -157,6 +157,9 @@ def checkout(wrap, repo_dir, options): cmd.insert(1, '-b') mlog.log('Checkout {} in {}...'.format(branch_name, wrap.name)) try: + # Stash any pending changes. Don't use git_output() here because we want + # the user to see his changes have been saved. + git(['stash'], repo_dir, check=True, universal_newlines=True) git_output(cmd, repo_dir) git_show(repo_dir) except subprocess.CalledProcessError as e: |