mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 03:31:05 +00:00
git-update: Use --autosquash during pull --rebase
This option has existed forever and allows people to automatically update and autosquash/pop changes in subproject git repositories.
This commit is contained in:
parent
07424d2fdf
commit
6707b41d08
1 changed files with 1 additions and 1 deletions
|
@ -46,7 +46,7 @@ def update_repo(repo_name, repo_dir, revision, no_interaction, recurse_i=0):
|
|||
git("fetch", repository_path=repo_dir)
|
||||
git("checkout", revision, repository_path=repo_dir)
|
||||
else:
|
||||
git("pull", "--rebase", repository_path=repo_dir)
|
||||
git("pull", "--rebase", "--autostash", repository_path=repo_dir)
|
||||
except Exception as e:
|
||||
out = getattr(e, "output", b"").decode()
|
||||
if not no_interaction:
|
||||
|
|
Loading…
Reference in a new issue