From 6cd3ff53f5320dc5506e9193ccd6aef02bbc5623 Mon Sep 17 00:00:00 2001
From: Peter Evans <peter-evans@users.noreply.github.com>
Date: Tue, 13 Aug 2019 16:22:52 +0900
Subject: [PATCH] Update for actions v2

---
 create-pull-request.py | 41 ++++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/create-pull-request.py b/create-pull-request.py
index bf2105e..9ef108e 100755
--- a/create-pull-request.py
+++ b/create-pull-request.py
@@ -49,6 +49,10 @@ def set_git_config(git, email, name):
     git.config('--global', 'user.name', '"%s"' % name)
 
 
+def set_git_remote_url(git, token, github_repository):
+    git.remote('set-url', 'origin', "https://%s:x-oauth-basic@github.com/%s" % (token, github_repository))
+
+
 def commit_changes(git, branch, commit_message):
     git.checkout('HEAD', b=branch)
     git.add('-A')
@@ -64,7 +68,7 @@ def create_pull_request(token, repo, head, base, title, body):
         head=head)
 
 
-def process_event(github_event, repo, branch):
+def process_event(github_event, repo, branch, base):
     # Fetch required environment variables
     github_token = os.environ['GITHUB_TOKEN']
     github_repository = os.environ['GITHUB_REPOSITORY']
@@ -83,9 +87,8 @@ def process_event(github_event, repo, branch):
     author_email, author_name = get_head_author(github_event)
     # Set git configuration
     set_git_config(repo.git, author_email, author_name)
-
-    # Set the target base branch of the pull request
-    base = repo.active_branch.name
+    # Update URL for the 'origin' remote
+    set_git_remote_url(repo.git, github_token, github_repository)
 
     # Commit the repository changes
     print("Committing changes.")
@@ -114,18 +117,26 @@ if not ignore_event(github_event):
 
     # Fetch/Set the branch name
     branch = os.getenv('PULL_REQUEST_BRANCH', 'create-pull-request/patch')
-    # Suffix with the short SHA1 hash
-    branch = "%s-%s" % (branch, get_head_short_sha1(repo))
+    # Set the current branch as the target base branch
+    base = os.environ['GITHUB_REF'][11:]
 
-    # Check if a PR branch already exists for this HEAD commit
-    if not pr_branch_exists(repo, branch):
-        # Check if there are changes to pull request
-        if repo.is_dirty() or len(repo.untracked_files) > 0:
-            print("Repository has modified or untracked files.")
-            process_event(github_event, repo, branch)
+    # Skip if the current branch is a PR branch created by this action
+    if not base.startswith(branch):
+        # Suffix with the short SHA1 hash
+        branch = "%s-%s" % (branch, get_head_short_sha1(repo))
+
+        # Check if a PR branch already exists for this HEAD commit
+        if not pr_branch_exists(repo, branch):
+            # Check if there are changes to pull request
+            if repo.is_dirty() or len(repo.untracked_files) > 0:
+                print("Repository has modified or untracked files.")
+                process_event(github_event, repo, branch, base)
+            else:
+                print("Repository has no modified or untracked files. Skipping.")
         else:
-            print("Repository has no modified or untracked files. Skipping.")
+            print(
+                "Pull request branch '%s' already exists for this commit. Skipping." %
+                branch)
     else:
         print(
-            "Pull request branch '%s' already exists for this commit. Skipping." %
-            branch)
+            "Branch '%s' was created by this action. Skipping." % base)