Details
-
Bug
-
Resolution: Fixed
-
Low
-
2.6.0
Description
During slurp, if a branch is removed remotely, we run git branch -d [branch name]:
C:\Code\fe\output\dist_inst\var\cache\jquery\clone>git branch -d support.1.6 error: The branch 'support.1.6' is not fully merged. If you are sure you want to delete it, run 'git branch -D support.1.6'. C:\Code\fe\output\dist_inst\var\cache\jquery\clone>echo %errorlevel% 1
Causing the following Exception:
[java] com.cenqua.fisheye.config.ConfigException: com.atlassian.utils.process.ProcessExceptio n: While executing: "git branch -d support.1.6 " [java] at com.atlassian.fisheye.git.GitScanner.removeLocalBranch(GitScanner.java:198) [java] at com.atlassian.fisheye.git.GitScanner.fetchLatest(GitScanner.java:173) [java] at com.atlassian.fisheye.dvcs.DvcsScanner.updateClone(DvcsScanner.java:159) [java] at com.atlassian.fisheye.dvcs.DvcsScanner.updateLocalRepoCache(DvcsScanner.java:14 6) [java] at com.cenqua.fisheye.rep.BaseRepositoryScanner.ping(BaseRepositoryScanner.java:19 4) [java] at com.cenqua.fisheye.rep.BaseRepositoryEngine.doSlurp(BaseRepositoryEngine.java:9 0) [java] at com.cenqua.fisheye.rep.RepositoryEngine.slurp(RepositoryEngine.java:390) [java] at com.cenqua.fisheye.rep.ping.OneOffPingRequest.doRequest(OneOffPingRequest.java: 25) [java] at com.cenqua.fisheye.rep.ping.PingRequest.process(PingRequest.java:66) [java] at com.cenqua.fisheye.rep.RepositoryHandle.processPingRequests(RepositoryHandle.ja va:132) [java] at com.cenqua.fisheye.rep.RepositoryHandle.queuePingRequest(RepositoryHandle.java: 122) [java] at com.cenqua.fisheye.rep.ping.PingRequest.run(PingRequest.java:33) [java] at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java: 886) [java] at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) [java] at java.lang.Thread.run(Thread.java:619) [java] Caused by: com.atlassian.utils.process.ProcessException: While executing: "git branch -d support.1.6 " [java] at com.atlassian.fisheye.dvcs.client.DvcsContext.executeCommand(DvcsContext.java:2 27) [java] at com.atlassian.fisheye.dvcs.client.DvcsContext.executeCommand(DvcsContext.java:2 19) [java] at com.atlassian.fisheye.git.GitScanner.removeLocalBranch(GitScanner.java:196) [java] ... 14 more [java] Caused by: com.atlassian.utils.process.ProcessException: Non-zero exit code: 1 [java] at com.atlassian.utils.process.PluggableProcessHandler.complete(PluggableProcessHa ndler.java:83) [java] at com.atlassian.utils.process.ExternalProcess.finish(ExternalProcess.java:303) [java] at com.atlassian.utils.process.ExternalProcess.execute(ExternalProcess.java:346) [java] at com.atlassian.fisheye.dvcs.client.DvcsContext.executeCommand(DvcsContext.java:2 24) [java] ... 16 more
Attachments
Issue Links
- is duplicated by
-
FE-3541 Git plugin fails to delete 'not fully merged' branch
- Closed