Skip to content

Commit c4af574

Browse files
halostatuemislav
halostatue
and
mislav
authored
Change default protocol to HTTPS (#2939)
Explicitly setting `hub.protocol` to `git` or using `HUB_PROTOCOL=git` still uses the `git` protocol. Co-authored-by: Mislav Marohnić <[email protected]>
1 parent e7576e0 commit c4af574

17 files changed

+141
-166
lines changed

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ Usage
1414

1515
``` sh
1616
$ hub clone rtomayko/tilt
17-
#=> git clone git://github.com/rtomayko/tilt.git
17+
#=> git clone https://github.com/rtomayko/tilt.git
1818

19-
# if you prefer HTTPS to git/SSH protocols:
20-
$ git config --global hub.protocol https
19+
# or, if you prefer the SSH protocol:
20+
$ git config --global hub.protocol ssh
2121
$ hub clone rtomayko/tilt
22-
#=> git clone https://github.com/rtomayko/tilt.git
22+
#=> git clone git@github.com:rtomayko/tilt.git
2323
```
2424

2525
See [usage examples](https://hub.github.com/#developer) or the [full reference

‎commands/clone.go

+10-13
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,13 @@ var cmdClone = &Command{
2727
2828
## Protocol used for cloning
2929
30-
The ''git:'' protocol will be used for cloning public repositories, while the SSH
31-
protocol will be used for private repositories and those that you have push
32-
access to. Alternatively, hub can be configured to use HTTPS protocol for
33-
everything. See "HTTPS instead of git protocol" and "HUB_PROTOCOL" of hub(1).
30+
HTTPS protocol is used by hub as the default. Alternatively, hub can be
31+
configured to use SSH protocol for all git operations. See "SSH instead
32+
of HTTPS protocol" and "HUB_PROTOCOL" of hub(1).
3433
3534
## Examples:
3635
$ hub clone rtomayko/ronn
37-
> git clone git://github.com/rtomayko/ronn.git
36+
> git clone https://github.com/rtomayko/ronn.git
3837
3938
## See also:
4039
@@ -53,7 +52,7 @@ func clone(command *Command, args *Args) {
5352
}
5453

5554
func transformCloneArgs(args *Args) {
56-
isSSH := parseClonePrivateFlag(args)
55+
isPrivate := parseClonePrivateFlag(args)
5756

5857
// git help clone | grep -e '^ \+-.\+<'
5958
p := utils.NewArgsParser()
@@ -80,7 +79,7 @@ func transformCloneArgs(args *Args) {
8079
i := p.PositionalIndices[0]
8180
a := args.Params[i]
8281
if nameWithOwnerRegexp.MatchString(a) && !isCloneable(a) {
83-
url := getCloneURL(a, isSSH, args.Command != "submodule")
82+
url := getCloneURL(a, isPrivate, args.Command != "submodule")
8483
args.ReplaceParam(i, url)
8584
}
8685
}
@@ -95,7 +94,7 @@ func parseClonePrivateFlag(args *Args) bool {
9594
return false
9695
}
9796

98-
func getCloneURL(nameWithOwner string, isSSH, allowSSH bool) string {
97+
func getCloneURL(nameWithOwner string, allowPush, allowPrivate bool) string {
9998
name := nameWithOwner
10099
owner := ""
101100
if strings.Contains(name, "/") {
@@ -146,11 +145,9 @@ func getCloneURL(nameWithOwner string, isSSH, allowSSH bool) string {
146145
}
147146
}
148147

149-
if !isSSH &&
150-
allowSSH &&
151-
!github.IsHTTPSProtocol() {
152-
isSSH = repo.Private || repo.Permissions.Push
148+
if !allowPush && allowPrivate {
149+
allowPush = repo.Private || repo.Permissions.Push
153150
}
154151

155-
return project.GitURL(name, owner, isSSH)
152+
return project.GitURL(name, owner, allowPush)
156153
}

‎commands/fork.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ func fork(cmd *Command, args *Args) {
5353
host, err := config.PromptForHost(project.Host)
5454
utils.Check(github.FormatError("forking repository", err))
5555

56-
originRemote, err := localRepo.RemoteForProject(project)
57-
utils.Check(err)
58-
5956
params := map[string]interface{}{}
6057
forkOwner := host.User
6158
if flagForkOrganization := args.Flag.Value("--org"); flagForkOrganization != "" {
@@ -100,8 +97,7 @@ func fork(cmd *Command, args *Args) {
10097

10198
args.NoForward()
10299
if !args.Flag.Bool("--no-remote") {
103-
104-
originURL := originRemote.URL.String()
100+
originURL := project.GitURL("", "", false)
105101
url := forkProject.GitURL("", "", true)
106102

107103
// Check to see if the remote already exists.

‎features/authentication.feature

+2-2
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ Feature: OAuth authentication
322322
"""
323323
Given $GITHUB_TOKEN is "PTOKEN"
324324
When I successfully run `hub clone dotfiles`
325-
Then it should clone "git@github.com:parkr/dotfiles.git"
325+
Then it should clone "https://github.com/parkr/dotfiles.git"
326326
And the file "../home/.config/hub" should contain "user: mislav"
327327
And the file "../home/.config/hub" should contain "oauth_token: OTOKEN"
328328

@@ -462,7 +462,7 @@ Feature: OAuth authentication
462462
And the file "../home/.config/hub" should contain "git.my.org"
463463
And the file "../home/.config/hub" should contain "user: mislav"
464464
And the file "../home/.config/hub" should contain "oauth_token: OTOKEN"
465-
And the url for "mislav" should be "git@git.my.org:mislav/dotfiles.git"
465+
And the url for "mislav" should be "https://git.my.org/mislav/dotfiles.git"
466466

467467
Scenario: Broken config is missing user.
468468
Given a file named "../home/.config/hub" with:

‎features/checkout.feature

+2-1
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ Feature: hub checkout <PULLREQ-URL>
273273
}, :maintainer_can_modify => true
274274
}
275275
"""
276+
And git protocol is preferred
276277
When I successfully run `hub checkout -f https://github.com/mojombo/jekyll/pull/77 -q`
277278
Then "git fetch origin refs/pull/77/head:fixes" should be run
278279
And "git checkout -f fixes -q" should be run
@@ -299,6 +300,7 @@ Feature: hub checkout <PULLREQ-URL>
299300
}, :maintainer_can_modify => true
300301
}
301302
"""
303+
And git protocol is preferred
302304
And I am on the "fixes" branch
303305
And there is a git FETCH_HEAD
304306
When I successfully run `hub checkout https://github.com/mojombo/jekyll/pull/77`
@@ -328,7 +330,6 @@ Feature: hub checkout <PULLREQ-URL>
328330
}, :maintainer_can_modify => true
329331
}
330332
"""
331-
And HTTPS is preferred
332333
When I successfully run `hub checkout -f https://github.com/mojombo/jekyll/pull/77 -q`
333334
Then "git fetch origin refs/pull/77/head:fixes" should be run
334335
And "git checkout -f fixes -q" should be run

‎features/cherry_pick.feature

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ Feature: hub cherry-pick
4545

4646
Scenario: Using GitHub owner@SHA notation with remote add
4747
When I run `hub cherry-pick mislav@a319d88`
48-
Then "git remote add _hub-cherry-pick git://github.com/mislav/ronn.git" should be run
48+
Then "git remote add _hub-cherry-pick https://github.com/mislav/ronn.git" should be run
4949
And "git fetch -q --no-tags _hub-cherry-pick" should be run
5050
And "git remote rm _hub-cherry-pick" should be run
5151
And "git cherry-pick a319d88" should be run
5252

5353
Scenario: From fork that doesn't have a remote
5454
When I run `hub cherry-pick https://github.com/jingweno/ronn/commit/a319d88`
55-
Then "git remote add _hub-cherry-pick git://github.com/jingweno/ronn.git" should be run
55+
Then "git remote add _hub-cherry-pick https://github.com/jingweno/ronn.git" should be run
5656
And "git fetch -q --no-tags _hub-cherry-pick" should be run
5757
And "git remote rm _hub-cherry-pick" should be run
5858
And "git cherry-pick a319d88" should be run

‎features/clone.feature

+28-13
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Feature: hub clone
1212
}
1313
"""
1414
When I successfully run `hub clone rtomayko/ronn`
15-
Then it should clone "git://github.com/rtomayko/ronn.git"
15+
Then it should clone "https://github.com/rtomayko/ronn.git"
1616
And the output should not contain anything
1717

1818
Scenario: Clone a public repo with period in name
@@ -25,7 +25,7 @@ Feature: hub clone
2525
}
2626
"""
2727
When I successfully run `hub clone hookio/hook.js`
28-
Then it should clone "git://github.com/hookio/hook.js.git"
28+
Then it should clone "https://github.com/hookio/hook.js.git"
2929
And the output should not contain anything
3030

3131
Scenario: Clone a public repo that starts with a period
@@ -38,7 +38,7 @@ Feature: hub clone
3838
}
3939
"""
4040
When I successfully run `hub clone zhuangya/.vim`
41-
Then it should clone "git://github.com/zhuangya/.vim.git"
41+
Then it should clone "https://github.com/zhuangya/.vim.git"
4242
And the output should not contain anything
4343

4444
Scenario: Clone a repo even if same-named directory exists
@@ -52,11 +52,24 @@ Feature: hub clone
5252
"""
5353
And a directory named "rtomayko/ronn"
5454
When I successfully run `hub clone rtomayko/ronn`
55+
Then it should clone "https://github.com/rtomayko/ronn.git"
56+
And the output should not contain anything
57+
58+
Scenario: Clone a public repo with git
59+
Given git protocol is preferred
60+
Given the GitHub API server:
61+
"""
62+
get('/repos/rtomayko/ronn') {
63+
json :private => false,
64+
:name => 'ronn', :owner => { :login => 'rtomayko' },
65+
:permissions => { :push => false }
66+
}
67+
"""
68+
When I successfully run `hub clone rtomayko/ronn`
5569
Then it should clone "git://github.com/rtomayko/ronn.git"
5670
And the output should not contain anything
5771

5872
Scenario: Clone a public repo with HTTPS
59-
Given HTTPS is preferred
6073
Given the GitHub API server:
6174
"""
6275
get('/repos/rtomayko/ronn') {
@@ -80,7 +93,7 @@ Feature: hub clone
8093
"""
8194
When I successfully run `git config --global alias.c "clone --bare"`
8295
And I successfully run `hub c rtomayko/ronn`
83-
Then "git clone --bare git://github.com/rtomayko/ronn.git" should be run
96+
Then "git clone --bare https://github.com/rtomayko/ronn.git" should be run
8497
And the output should not contain anything
8598

8699
Scenario: Unchanged public clone
@@ -133,8 +146,8 @@ Feature: hub clone
133146
:permissions => { :push => false }
134147
}
135148
"""
136-
When I successfully run `hub --noop clone -p rtomayko/ronn`
137-
Then the output should contain exactly "git clone git@github.com:rtomayko/ronn.git\n"
149+
When I successfully run `hub --noop clone rtomayko/ronn`
150+
Then the output should contain exactly "git clone https://github.com/rtomayko/ronn.git\n"
138151
But it should not clone anything
139152

140153
Scenario: Clone a private repo
@@ -147,7 +160,7 @@ Feature: hub clone
147160
}
148161
"""
149162
When I successfully run `hub clone -p rtomayko/ronn`
150-
Then it should clone "git@github.com:rtomayko/ronn.git"
163+
Then it should clone "https://github.com/rtomayko/ronn.git"
151164
And the output should not contain anything
152165

153166
Scenario: Clone my repo
@@ -160,7 +173,7 @@ Feature: hub clone
160173
}
161174
"""
162175
When I successfully run `hub clone dotfiles`
163-
Then it should clone "git@github.com:mislav/dotfiles.git"
176+
Then it should clone "https://github.com/mislav/dotfiles.git"
164177
And the output should not contain anything
165178

166179
Scenario: Clone my repo that doesn't exist
@@ -184,7 +197,7 @@ Feature: hub clone
184197
}
185198
"""
186199
When I successfully run `hub clone --bare -o master dotfiles`
187-
Then "git clone --bare -o master git@github.com:mislav/dotfiles.git" should be run
200+
Then "git clone --bare -o master https://github.com/mislav/dotfiles.git" should be run
188201
And the output should not contain anything
189202

190203
Scenario: Clone repo to which I have push access to
@@ -196,6 +209,7 @@ Feature: hub clone
196209
:permissions => { :push => true }
197210
}
198211
"""
212+
And git protocol is preferred
199213
When I successfully run `hub clone sstephenson/rbenv`
200214
Then "git clone [email protected]:sstephenson/rbenv.git" should be run
201215
And the output should not contain anything
@@ -209,6 +223,7 @@ Feature: hub clone
209223
:permissions => { :push => true }
210224
}
211225
"""
226+
And git protocol is preferred
212227
When I successfully run `hub --noop clone sstephenson/rbenv`
213228
Then the output should contain exactly "git clone [email protected]:sstephenson/rbenv.git\n"
214229
But it should not clone anything
@@ -225,7 +240,7 @@ Feature: hub clone
225240
}
226241
"""
227242
When I successfully run `hub clone myorg/myrepo`
228-
Then it should clone "git@git.my.org:myorg/myrepo.git"
243+
Then it should clone "https://git.my.org/myorg/myrepo.git"
229244
And the output should not contain anything
230245

231246
Scenario: Clone from existing directory is a local clone
@@ -251,7 +266,7 @@ Feature: hub clone
251266
}
252267
"""
253268
When I successfully run `hub clone rtomayko/ronn.wiki`
254-
Then it should clone "git://github.com/RTomayko/ronin.wiki.git"
269+
Then it should clone "https://github.com/RTomayko/ronin.wiki.git"
255270
And the output should not contain anything
256271

257272
Scenario: Clone a nonexisting wiki
@@ -284,5 +299,5 @@ Feature: hub clone
284299
}
285300
"""
286301
When I successfully run `hub clone rtomayko/ronn`
287-
Then it should clone "git://github.com/RTomayko/ronin.git"
302+
Then it should clone "https://github.com/RTomayko/ronin.git"
288303
And the output should not contain anything

0 commit comments

Comments
 (0)