Skip to content
This repository was archived by the owner on Jan 17, 2021. It is now read-only.

Solves proxy issue, closes #74 when proxy is set at .profile - #121

Merged
deansheather merged 2 commits into
coder:masterfrom
eargollo:proxy-support
Jun 27, 2019
Merged

deansheather merged 2 commits into
coder:masterfrom
eargollo:proxy-support

Conversation

@eargollo

Copy link
Copy Markdown
Contributor

No description provided.

@eargollo eargollo mentioned this pull request Jun 18, 2019

@deansheather deansheather left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but we can't merge this until you set proper git user details and sign the commit with PGP.

git config --global user.name "name"
git config --global user.email "email"

@eargollo

Copy link
Copy Markdown
Contributor Author

Weird. This is my .gitconfig:

$ cat ~/.gitconfig
[core]
        autocrlf = false
        eol = lf
[user]
        name = Eduardo Argollo
        email = eduardo@hp.com
[alias]
        aliases = config --get-regexp alias
        s = status -s
        psu = push --set-upstream
        lg=log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative

What should I do? Create another branch, push the code again and do a new PR?

Thanks.

@deansheather

Copy link
Copy Markdown
Collaborator

You can amend the commit and then force push to your branch.

@eargollo

eargollo commented Jun 24, 2019 •

Copy link
Copy Markdown
Contributor Author

Just did that.

$ git commit --amend --author="Eduardo Argollo <eduardo@argollo.com>"
$ git push -u proxy-support -f
$ git log
commit 43c4094557c34299294625abd4d92131ddd02a07 (HEAD -> proxy-support, origin/proxy-support)
Author: Eduardo Argollo <eduardo@argollo.com>
Date:   Mon Jun 17 20:36:49 2019 -0700

    Solves proxy issue, closes #74 when proxy is set at .profile configuration

commit 5bbc39f0ddc5a7f15a75a699a2b04562b1cb0bd3 (upstream/master, master)
Merge: f8ccd3a 4195d99
Author: Dean Sheather <dean@deansheather.com>
Date:   Wed Jun 5 17:17:03 2019 +1000

    Merge pull request #114 from loverdos/portable_bash

    Use bash in a more portable way

Let me know if that worked out.

Tks

@deansheather

Copy link
Copy Markdown
Collaborator

Just needs to be signed with PGP now. You can amend and sign with git commit --amend -S once you've setup a PGP key and added it to your GitHub account.

@eargollo

Copy link
Copy Markdown
Contributor Author

Done. First time I use gpg on a git commit. Thanks for the patience.

@deansheather
deansheather merged commit c637d40 into coder:master Jun 27, 2019
@deansheather

Copy link
Copy Markdown
Collaborator

Thank you for this PR. 😃

@deansheather

deansheather commented Jul 26, 2019 •

Copy link
Copy Markdown
Collaborator

@eargollo Could you reopen your changes on PR #118 for Windows support? Oops, forgot you've already done it in #124.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants