This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
Summary: | org.eclipse.jgit.api.errors.JGitInternalException: Cannot cherry-pick commit '423ed74ec7c27f9fba3cdeb8899b63f7c8e3f4e5' because it has 0 parents, only commits with exactly one parent are supported. | ||
---|---|---|---|
Product: | versioncontrol | Reporter: | markiewb |
Component: | Git | Assignee: | Ondrej Vrabec <ovrabec> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | git, Istoniz |
Priority: | P4 | ||
Version: | 7.4 | ||
Hardware: | All | ||
OS: | All | ||
Issue Type: | DEFECT | Exception Reporter: | 201015 |
Bug Depends on: | 230572 | ||
Bug Blocks: | |||
Attachments: |
stacktrace
stacktrace |
Description
markiewb
2013-07-25 21:16:07 UTC
Created attachment 137824 [details]
stacktrace
> Cannot cherry-pick commit '423ed74ec7c27f9fba3cdeb8899b63f7c8e3f4e5' because it > has 0 parents, only commits with exactly one parent are supported.
weird, isn't it? What can you tell me about this commit? Is it one of the commits you tried to rebase? Is it true it has no parents???
(In reply to comment #2) > > Cannot cherry-pick commit '423ed74ec7c27f9fba3cdeb8899b63f7c8e3f4e5' because it > has 0 parents, only commits with exactly one parent are supported. > weird, isn't it? What can you tell me about this commit? Is it one of the > commits you tried to rebase? Is it true it has no parents??? IIRC my steps were the following * create a local git repo, check in some files * create a remote repo at github * pull in the remote repo as origin into the local git repo (using the "pull..." action) -> netbeans asks to merge/rebase -> chose rebase > * create a remote repo at github
Does it mean the remote repository was empty? Contained no commit yet?
I was able to reproduce but only if the remote repository was not empty (already contained a commit). BTW the exception seems to be thrown no more in JGit: http://git.eclipse.org/c/jgit/jgit.git/commit/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java?id=3ad454497cdb6a917c00b01c735f5a469b8fb2ff so this should get fixed when we upgrade JGit to 3.x (In reply to comment #5) > I was able to reproduce but only if the remote repository was not empty > (already contained a commit). You are right. There must have been a remote commit. (readme.md was there by default) Created attachment 140600 [details]
stacktrace
stop working after rebase git action
upgraded JGit to 3.1.0 => should be fixed i guess. |