diff --git a/bin/git-pull-request b/bin/git-pull-request index 8a0ad0300..225c3e1a3 100755 --- a/bin/git-pull-request +++ b/bin/git-pull-request @@ -28,15 +28,12 @@ json() { EOF } -# user +# personal access token +# config name is github-personal-access-token '_' is not allowed in git config -user=$(git config user.email) +github_personal_access_token=$(git config git-extras.github-personal-access-token) -if [ -z "$user" ]; then - user="$EMAIL" -fi - -test -z "$user" && abort "git config user.email required" +test -z "$github_personal_access_token" && abort "git config git-extras.github-personal-access-token required" # branch @@ -80,7 +77,9 @@ fi body=$(json "$title" "$body" "$branch" "$base") -curl -u "$user" \ - -H "X-GitHub-OTP: $mfa_code" \ - "https://api.github.com/repos/$project/pulls" -d "$body" - +curl \ + -X POST \ + -H "Accept: application/vnd.github.v3+json" \ + -H "Authorization: token $github_personal_access_token" \ + -H "X-GitHub-OTP: $mfa_code" \ + "https://api.github.com/repos/$project/pulls" -d "$body" \ No newline at end of file diff --git a/man/git-pull-request.1 b/man/git-pull-request.1 index 2d8190e9a..2c84717b2 100644 --- a/man/git-pull-request.1 +++ b/man/git-pull-request.1 @@ -1,30 +1,26 @@ -.\" generated with Ronn/v0.7.3 -.\" http://github.com/rtomayko/ronn/tree/0.7.3 -. -.TH "GIT\-PULL\-REQUEST" "1" "November 2017" "" "Git Extras" -. +.\" generated with Ronn-NG/v0.8.0 +.\" http://github.com/apjanke/ronn-ng/tree/0.8.0 +.TH "GIT\-PULL\-REQUEST" "1" "August 2020" "" "Git Extras" .SH "NAME" \fBgit\-pull\-request\fR \- Create pull request for GitHub project -. .SH "SYNOPSIS" \fBgit\-pull\-request\fR [] -. .SH "DESCRIPTION" Create pull request for a project on GitHub via command line\. -. .P -Uses the email from \fBgit config user\.email\fR to open the pull request\. -. +A personal access token is required for making the API call to open the pull request(s) in GitHub\. API Documentation here \fI\%https://docs\.github\.com/en/rest/reference/pulls#create\-a\-pull\-request\fR +.P +Make sure the personal access token has the right \fBOAuth\fR scopes for the repo(s) +.P +Use \fBgit config \-\-global \-\-add git\-extras\.github\-personal\-access\-token \fR +.P +If using mutiple accounts, override the global value in the specific repo using \fBgit config git\-extras\.github\-personal\-access\-token \fR .SH "OPTIONS" -. .P The target branch you want to send pull request to\. -. .SH "EXAMPLES" -. .nf - $ git pull\-request master Everything up\-to\-date @@ -35,16 +31,11 @@ Everything up\-to\-date base [master]: GitHub two\-factor authentication code (leave blank if not set up): -Enter host password for user \'spacewanderlzx@gmail\.com\': -\.\.\. -. +\|\.\|\.\|\. .fi -. .SH "AUTHOR" -Written by Tj Holowaychuk <\fItj@vision\-media\.ca\fR> -. +Written by Tj Holowaychuk <\fI\%mailto:tj@vision\-media\.ca\fR> .SH "REPORTING BUGS" -<\fIhttps://github\.com/tj/git\-extras/issues\fR> -. +<\fI\%https://github\.com/tj/git\-extras/issues\fR> .SH "SEE ALSO" -<\fIhttps://github\.com/tj/git\-extras\fR> +<\fI\%https://github\.com/tj/git\-extras\fR> diff --git a/man/git-pull-request.html b/man/git-pull-request.html index 0eba0c93c..81cc51278 100644 --- a/man/git-pull-request.html +++ b/man/git-pull-request.html @@ -1,8 +1,8 @@ - - + + git-pull-request(1) - Create pull request for GitHub project