squash

Author: gvrose8192

.github/workflows/process-git-request.py

@@ -23,12 +23,12 @@ def process_git_request(fname, target_branch, source_branch, prj_dir):
 #    print(f"Working Dir : {working_dir}")
     os.chdir(working_dir)
 #    print(f"pwd : {os.getcwd()}")
-    git_cmd = f"git checkout {target_branch}"
-    gitbr_out, gitbr_err = subprocess.Popen(git_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True).communicate()
-    if gitbr_err:
-        print(f"Could not check out target branch {target_branch} {gitbr_err}")
-        return 1
-    git_cmd = f"git checkout -b {source_branch}"
+#    git_cmd = f"git checkout {target_branch}"
+#    gitbr_out, gitbr_err = subprocess.Popen(git_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True).communicate()
+#    if gitbr_err:
+#        print(f"Could not check out target branch {target_branch} {gitbr_err}")
+#        return 1
+    git_cmd = f"git checkout -b {source_branch} origin/{source_branch}"
     gitbr_out, gitbr_err = subprocess.Popen(git_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True).communicate()
     if gitbr_err:
         print(f"Could not check out source branch {source_branch} {gitbr_err}")