diff --git a/CMakeLists.txt b/CMakeLists.txt index 366a603..62efb0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.25) -project(COSC-4P80-Assignment-1 VERSION 1.0.0) +project(COSC-4P80-Assignment-1 VERSION 1.1.0) option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF) option(ENABLE_UBSAN "Enable the ub sanitizer" OFF) diff --git a/commit.py b/commit.py index 1b73249..102cade 100755 --- a/commit.py +++ b/commit.py @@ -164,8 +164,7 @@ def inc_patch(config: Config, cmake_text): def make_branch(config: Config, name): print(f"Making new branch {name}") - subprocess.call(["git", "branch", "-b", name]) - subprocess.call(["git", "checkout", name]) + subprocess.call(["git", "checkout", "-b", name]) subprocess.call(["git", "merge", config.main_branch]) subprocess.call(["git", "checkout", config.main_branch]) @@ -174,7 +173,7 @@ def make_release(env: EnvData, name): repos_v = open_process(["git", "remote", "-v"])[0].splitlines() urls = [] for line in repos_v: - origin = itertools.takewhile(lambda c: not c.isspace(), line) + origin = ''.join(itertools.takewhile(lambda c: not c.isspace(), line)) print(f"Origin: {origin}") urls.append(open_process(["git", "remote", "get-url", origin])[0]) urls = set(urls)