Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

hub cherry-pick (can) fail(s) if remote already exists #444

Open
reitblatt opened this Issue · 3 comments

3 participants

@reitblatt
bash-3.2$ hub --version
git version 1.8.3.4
hub version 1.10.6

Previously handled pull-requests from this fork, went to cherry-pick a commit:

bash-3.2$ hub cherry-pick https://github.com/adferguson/frenetic/commit/d952e26028661b3e15d7b84610bc8104b17de812
fatal: remote adferguson already exists.

Also fails with github markdown:

hub cherry-pick adferguson@d952e26028661b3e15d7b84610bc8104b17de812
fatal: remote adferguson already exists.

Removing the remote and then cherry-picking works. Can't seem to force it to reproduce.

@mislav
Owner

I think this can happen if you had a "adferguson" remote that does not point to https://github.com/adferguson/frenetic repo. It would then try to add a new "adferguson" remote and fail like your case above.

Not sure if I want to fix this. I found myself never using cherry-pick anymore since it pollutes my local git repo with remotes. I use hub am <URL> instead. I might deprecate cherry-pick in favor of am, or even implement cherry-pick like am.

@blainesch

@mislav instead of adding a permanent remote, could it add a temporary one with random characters, fetch, cherry pick, then delete it? Or if one exists with a different url append a number to the end until no collisions are found such as adferguson1?

@mislav
Owner

We will probably go with the approach I described in my above comment: avoiding adding the remote & git pull and just go with the hub am approach: download the patch for the commit directly from GitHub API and apply it.

@mislav mislav added the bug label
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.