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.

Bug 252366 - org.eclipse.jgit.errors.RevisionSyntaxException:refs/heads/master[Conflict]
Summary: org.eclipse.jgit.errors.RevisionSyntaxException:refs/heads/master[Conflict]
Status: RESOLVED INCOMPLETE
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 8.0
Hardware: All All
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-05-12 15:34 UTC by Exceptions Reporter
Modified: 2015-07-29 14:13 UTC (History)
1 user (show)

See Also:
Issue Type: DEFECT
Exception Reporter: 217261

Attachments
stacktrace (2.20 KB, text/plain)
2015-05-12 15:35 UTC, Exceptions Reporter 		Details
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Exceptions Reporter 2015-05-12 15:34:58 UTC 
This bug was originally marked as duplicate of bug 247347, that is already resolved. This bug is still valid, so this seems to be another bug, but it might be related.

Build: NetBeans IDE 8.0.2 (Build 201411181905)
VM: Java HotSpot(TM) 64-Bit Server VM, 25.5-b02, Java(TM) SE Runtime Environment, 1.8.0_05-b13
OS: Mac OS X

User Comments:
GUEST: Initial commit to a remote repository




Stacktrace: 
org.eclipse.jgit.errors.RevisionSyntaxException:refs/heads/master[Conflict]
   at org.eclipse.jgit.lib.Repository.resolve(Repository.java:706)
   at org.eclipse.jgit.lib.Repository.resolve(Repository.java:384)
   at org.eclipse.jgit.transport.RemoteRefUpdate.<init>(RemoteRefUpdate.java:192)
   at org.eclipse.jgit.transport.Transport.findRemoteRefUpdatesFor(Transport.java:646)
   at org.netbeans.libs.git.jgit.commands.PushCommand.runTransportCommand(PushCommand.java:111)
   at org.netbeans.libs.git.jgit.commands.TransportCommand.run(TransportCommand.java:191)
Comment 1 Exceptions Reporter 2015-05-12 15:35:00 UTC 
Created attachment 153619 [details]
stacktrace
Comment 2 Ondrej Vrabec 2015-07-10 11:57:10 UTC 
Real strange. Is it reproducible? Is it possible there is "refs/heads/master[Confict]" file inside the project's .git folder?