mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 21:21:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

git-update: Use git config to set autostash

Browse source 
The build bots don't like it; probably because the git version is
ancient there. Bots should ignore the unknown config variable.
This commit is contained in:
Nirbheek Chauhan 2016-11-10 01:10:58 +05:30
parent 90021b82af
commit 30a35c3d60
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
git-update
View file

@ -42,12 +42,13 @@ def update_subprojects(manifest, no_interaction=False):
def update_repo(repo_name, repo_dir, revision, no_interaction, recurse_i=0): def update_repo(repo_name, repo_dir, revision, no_interaction, recurse_i=0):
print("Updating %s..." % repo_name) print("Updating %s..." % repo_name)
git("config", "rebase.autoStash", "true", repository_path=repo_dir)
try: try:
if revision: if revision:
git("fetch", repository_path=repo_dir) git("fetch", repository_path=repo_dir)
git("checkout", revision, repository_path=repo_dir) git("checkout", revision, repository_path=repo_dir)
else: else:
git("pull", "--rebase", "--autostash", repository_path=repo_dir) git("pull", "--rebase", repository_path=repo_dir)
except Exception as e: except Exception as e:
out = getattr(e, "output", b"").decode() out = getattr(e, "output", b"").decode()
if not no_interaction: if not no_interaction: