The branch, master has been updated via 07081d03da2 script/autobuild.py: allow to run from within git rebase -i from 922261d77ae smbd: Use filename_convert_dirfsp() in smbd_smb2_create_send()
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 07081d03da2a49010fdc905a39e48dd589be47b2 Author: Stefan Metzmacher <me...@samba.org> Date: Tue Apr 12 15:04:53 2022 +0000 script/autobuild.py: allow to run from within git rebase -i The 'git clone' used by autobuild.py fails if GIT_DIR and GIT_WORK_TREE are already defined in the environment. Signed-off-by: Stefan Metzmacher <me...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> Autobuild-User(master): Stefan Metzmacher <me...@samba.org> Autobuild-Date(master): Thu Apr 28 15:23:24 UTC 2022 on sn-devel-184 ----------------------------------------------------------------------- Summary of changes: script/autobuild.py | 5 +++++ 1 file changed, 5 insertions(+) Changeset truncated at 500 lines: diff --git a/script/autobuild.py b/script/autobuild.py index d309fa0e97c..9f790d8a53e 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -31,6 +31,11 @@ os.environ["PYTHONUNBUFFERED"] = "1" # This speeds up testing remarkably. os.environ['TDB_NO_FSYNC'] = '1' +# allow autobuild to run within git rebase -i +if "GIT_DIR" in os.environ: + del os.environ["GIT_DIR"] +if "GIT_WORK_TREE" in os.environ: + del os.environ["GIT_WORK_TREE"] def find_git_root(): '''get to the top of the git repo''' -- Samba Shared Repository