Build failed in Jenkins: MSysGit - the development behind Git for Windows » git #286
36 views
Skip to first unread message
BuildHive
Aug 29, 2015, 11:44:42 AM8/29/15
to johannes....@gmx.de, msy...@googlegroups.com
See <https://buildhive.cloudbees.com/job/msysgit/job/git/286/>
------------------------------------------
GitHub pull request #374 to msysgit/git
Building remotely on s-c3cdb606 in workspace <https://buildhive.cloudbees.com/job/msysgit/job/git/ws/>
Cloning the remote Git repository
Cloning repository git://github.com/msysgit/git.git
git --version
git version 1.7.11.7
Opening connection
Done: 0
Counting objects
Done: 20750
Finding sources
Done: 20750
Getting sizes
Done: 2647
Compressing objects
Done: 41654
Writing objects
Done: 20750
remote: Resolving deltas
remote: Updating references
Merging refs/tags/changes/286
FATAL: Could not merge AnyObjectId[5e906e91ea3ca29a8916c34905662563ff2b2437]
hudson.plugins.git.GitException: Could not merge AnyObjectId[5e906e91ea3ca29a8916c34905662563ff2b2437]
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$2.execute(CliGitAPIImpl.java:315)
at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:63)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:47)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:299)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:280)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:239)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)
Caused by: hudson.plugins.git.GitException: Command "merge 5e906e91ea3ca29a8916c34905662563ff2b2437" returned status code 1:
stdout: Auto-merging t/t2027-checkout-long-paths.sh
Removing t/lib-gpg/trustdb.gpg
Removing t/lib-gpg/secring.gpg
Removing t/lib-gpg/random_seed
Removing t/lib-gpg/pubring.gpg
Auto-merging git-gui/git-gui.sh
CONFLICT (content): Merge conflict in git-gui/git-gui.sh
Removing generate-cmdlist.sh
Auto-merging contrib/hooks/multimail/post-receive.example
Auto-merging compat/poll/poll.c
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Removing Documentation/technical/api-strbuf.txt
Auto-merging Documentation/giteveryday.txt
Automatic merge failed; fix conflicts and then commit the result.
stderr:
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:928)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:909)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:853)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:863)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$2.execute(CliGitAPIImpl.java:313)
... 17 more
------------------------------------------
GitHub pull request #374 to msysgit/git
Building remotely on s-c3cdb606 in workspace <https://buildhive.cloudbees.com/job/msysgit/job/git/ws/>
Cloning the remote Git repository
Cloning repository git://github.com/msysgit/git.git
git --version
git version 1.7.11.7
Opening connection
Done: 0
Counting objects
Done: 20750
Finding sources
Done: 20750
Getting sizes
Done: 2647
Compressing objects
Done: 41654
Writing objects
Done: 20750
remote: Resolving deltas
remote: Updating references
Merging refs/tags/changes/286
FATAL: Could not merge AnyObjectId[5e906e91ea3ca29a8916c34905662563ff2b2437]
hudson.plugins.git.GitException: Could not merge AnyObjectId[5e906e91ea3ca29a8916c34905662563ff2b2437]
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$2.execute(CliGitAPIImpl.java:315)
at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:63)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:47)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:299)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:280)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:239)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)
Caused by: hudson.plugins.git.GitException: Command "merge 5e906e91ea3ca29a8916c34905662563ff2b2437" returned status code 1:
stdout: Auto-merging t/t2027-checkout-long-paths.sh
Removing t/lib-gpg/trustdb.gpg
Removing t/lib-gpg/secring.gpg
Removing t/lib-gpg/random_seed
Removing t/lib-gpg/pubring.gpg
Auto-merging git-gui/git-gui.sh
CONFLICT (content): Merge conflict in git-gui/git-gui.sh
Removing generate-cmdlist.sh
Auto-merging contrib/hooks/multimail/post-receive.example
Auto-merging compat/poll/poll.c
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Removing Documentation/technical/api-strbuf.txt
Auto-merging Documentation/giteveryday.txt
Automatic merge failed; fix conflicts and then commit the result.
stderr:
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:928)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:909)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:853)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:863)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$2.execute(CliGitAPIImpl.java:313)
... 17 more
BuildHive
Aug 30, 2015, 8:25:11 PM8/30/15
to johannes....@gmx.de, msy...@googlegroups.com
See <https://buildhive.cloudbees.com/job/msysgit/job/git/287/>
------------------------------------------
GitHub pull request #375 to msysgit/git
Building remotely on s-3b7e9fc2 in workspace <https://buildhive.cloudbees.com/job/msysgit/job/git/ws/>
Fetching changes from the remote Git repository
Fetching upstream changes from git://github.com/msysgit/git.git
Finding sources
Done: 0
Writing objects
Done: 0
remote: Updating references
Merging refs/tags/changes/287
Removing vcs-svn/trp.h
Removing vcs-svn/string_pool.txt
Removing vcs-svn/string_pool.h
Removing vcs-svn/string_pool.c
Removing vcs-svn/obj_pool.h
Removing test-treap.c
Removing test-string-pool.c
Removing test-obj-pool.c
Removing templates/hooks--post-receive.sample
Removing templates/hooks--post-commit.sample
Removing t/test9200a.png
Auto-merging t/t7104-reset-hard.sh
Removing t/t7004/trustdb.gpg
Removing t/t7004/secring.gpg
Removing t/t7004/random_seed
Removing t/t7004/pubring.gpg
Removing t/t5800-remote-helpers.sh
Removing t/t5551-http-fetch.sh
Removing t/t5550-http-fetch.sh
Removing t/t5541-http-push.sh
Auto-merging t/t5540-http-push-webdav.sh
Removing t/t3401-rebase-partial.sh
Removing t/t0080-vcs-svn.sh
Removing t/lib-prereq-FILEMODE.sh
Removing t/harness
Auto-merging strbuf.c
CONFLICT (content): Merge conflict in strbuf.c
Auto-merging po/.gitignore
Removing pack-refs.h
Removing pack-refs.c
Auto-merging merge-blobs.c
Removing hash.h
Removing hash.c
Auto-merging gitweb/static/js/blame_incremental.js
Removing git_remote_helpers/util.py
Removing git_remote_helpers/setup.py
Removing git_remote_helpers/setup.cfg
Removing git_remote_helpers/git/repo.py
Removing git_remote_helpers/git/non_local.py
Removing git_remote_helpers/git/importer.py
Removing git_remote_helpers/git/git.py
Removing git_remote_helpers/git/exporter.py
Removing git_remote_helpers/git/__init__.py
Removing git_remote_helpers/__init__.py
Removing git_remote_helpers/Makefile
Removing git-remote-testgit.py
Removing git-lost-found.sh
Auto-merging git-compat-util.h
CONFLICT (content): Merge conflict in git-compat-util.h
Removing generate-cmdlist.sh
Removing fixup-builtins
Removing contrib/vim/README
Removing contrib/patches/docbook-xsl-manpages-charmap.patch
Removing contrib/p4import/git-p4import.txt
Removing contrib/p4import/git-p4import.py
Removing contrib/p4import/README
Removing contrib/fast-import/git-p4.txt
Removing contrib/fast-import/git-p4.bat
Removing contrib/fast-import/git-p4
Auto-merging contrib/examples/git-repack.sh
Removing contrib/continuous/post-receive-cinotify
Removing contrib/continuous/cidaemon
Removing contrib/ciabot/ciabot.sh
Removing contrib/ciabot/ciabot.py
Removing contrib/ciabot/README
Removing contrib/blameview/blameview.perl
Removing contrib/blameview/README
Auto-merging compat/winansi.c
CONFLICT (content): Merge conflict in compat/winansi.c
Removing compat/vcbuild/include/termios.h
Removing compat/vcbuild/include/sys/wait.h
Removing compat/vcbuild/include/sys/socket.h
Removing compat/vcbuild/include/sys/select.h
Removing compat/vcbuild/include/sys/poll.h
Removing compat/vcbuild/include/sys/ioctl.h
Removing compat/vcbuild/include/pwd.h
Removing compat/vcbuild/include/netinet/tcp.h
Removing compat/vcbuild/include/netinet/in.h
Removing compat/vcbuild/include/netdb.h
Removing compat/vcbuild/include/inttypes.h
Removing compat/vcbuild/include/grp.h
Removing compat/vcbuild/include/arpa/inet.h
Removing compat/strtok_r.c
Auto-merging compat/regex/regcomp.c
CONFLICT (content): Merge conflict in compat/regex/regcomp.c
Auto-merging compat/poll/poll.c
Auto-merging compat/nedmalloc/malloc.c.h
Auto-merging compat/mingw.h
CONFLICT (content): Merge conflict in compat/mingw.h
Auto-merging compat/mingw.c
CONFLICT (content): Merge conflict in compat/mingw.c
Auto-merging compat/inet_ntop.c
Removing compat/fnmatch/fnmatch.h
Removing compat/fnmatch/fnmatch.c
Removing compat/cygwin.h
Removing compat/cygwin.c
Auto-merging builtin/upload-archive.c
CONFLICT (content): Merge conflict in builtin/upload-archive.c
Removing builtin/tar-tree.c
Auto-merging builtin/mktag.c
CONFLICT (content): Merge conflict in builtin/mktag.c
Auto-merging builtin/fast-export.c
CONFLICT (content): Merge conflict in builtin/fast-export.c
Auto-merging alloc.c
CONFLICT (content): Merge conflict in alloc.c
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Removing Documentation/technical/api-strbuf.txt
Removing Documentation/technical/api-hash.txt
Removing Documentation/pt_BR/gittutorial.txt
Auto-merging Documentation/giteveryday.txt
Removing Documentation/git-tar-tree.txt
Removing Documentation/git-repo-config.txt
Removing Documentation/git-remote-helpers.txt
Removing Documentation/git-peek-remote.txt
Removing Documentation/git-lost-found.txt
------------------------------------------
GitHub pull request #375 to msysgit/git
Building remotely on s-3b7e9fc2 in workspace <https://buildhive.cloudbees.com/job/msysgit/job/git/ws/>
Fetching changes from the remote Git repository
Fetching upstream changes from git://github.com/msysgit/git.git
Opening connection
Done: 0
Counting objects
Done: 0
Done: 0
Counting objects
Finding sources
Done: 0
Writing objects
Done: 0
remote: Updating references
Merging refs/tags/changes/287
FATAL: Could not merge AnyObjectId[5e906e91ea3ca29a8916c34905662563ff2b2437]
hudson.plugins.git.GitException: Could not merge AnyObjectId[5e906e91ea3ca29a8916c34905662563ff2b2437]
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$2.execute(CliGitAPIImpl.java:315)
at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:63)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:47)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:299)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:280)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:239)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)
Caused by: hudson.plugins.git.GitException: Command "merge 5e906e91ea3ca29a8916c34905662563ff2b2437" returned status code 1:
stdout: Removing vcs-svn/trp.txt
hudson.plugins.git.GitException: Could not merge AnyObjectId[5e906e91ea3ca29a8916c34905662563ff2b2437]
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$2.execute(CliGitAPIImpl.java:315)
at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:63)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:47)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:299)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:280)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:239)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)
Caused by: hudson.plugins.git.GitException: Command "merge 5e906e91ea3ca29a8916c34905662563ff2b2437" returned status code 1:
Removing vcs-svn/trp.h
Removing vcs-svn/string_pool.txt
Removing vcs-svn/string_pool.h
Removing vcs-svn/string_pool.c
Removing vcs-svn/obj_pool.h
Removing test-treap.c
Removing test-string-pool.c
Removing test-obj-pool.c
Removing templates/hooks--post-receive.sample
Removing templates/hooks--post-commit.sample
Removing t/test9200a.png
Auto-merging t/t7104-reset-hard.sh
Removing t/t7004/trustdb.gpg
Removing t/t7004/secring.gpg
Removing t/t7004/random_seed
Removing t/t7004/pubring.gpg
Removing t/t5800-remote-helpers.sh
Removing t/t5551-http-fetch.sh
Removing t/t5550-http-fetch.sh
Removing t/t5541-http-push.sh
Auto-merging t/t5540-http-push-webdav.sh
Removing t/t3401-rebase-partial.sh
Removing t/t0080-vcs-svn.sh
Removing t/lib-prereq-FILEMODE.sh
Removing t/harness
Auto-merging strbuf.c
CONFLICT (content): Merge conflict in strbuf.c
Auto-merging po/.gitignore
Removing pack-refs.h
Removing pack-refs.c
Auto-merging merge-blobs.c
Removing hash.h
Removing hash.c
Auto-merging gitweb/static/js/blame_incremental.js
Removing git_remote_helpers/util.py
Removing git_remote_helpers/setup.py
Removing git_remote_helpers/setup.cfg
Removing git_remote_helpers/git/repo.py
Removing git_remote_helpers/git/non_local.py
Removing git_remote_helpers/git/importer.py
Removing git_remote_helpers/git/git.py
Removing git_remote_helpers/git/exporter.py
Removing git_remote_helpers/git/__init__.py
Removing git_remote_helpers/__init__.py
Removing git_remote_helpers/Makefile
Removing git-remote-testgit.py
Removing git-lost-found.sh
Auto-merging git-compat-util.h
CONFLICT (content): Merge conflict in git-compat-util.h
Removing generate-cmdlist.sh
Removing fixup-builtins
Removing contrib/vim/README
Removing contrib/patches/docbook-xsl-manpages-charmap.patch
Removing contrib/p4import/git-p4import.txt
Removing contrib/p4import/git-p4import.py
Removing contrib/p4import/README
Removing contrib/fast-import/git-p4.txt
Removing contrib/fast-import/git-p4.bat
Removing contrib/fast-import/git-p4
Auto-merging contrib/examples/git-repack.sh
Removing contrib/continuous/post-receive-cinotify
Removing contrib/continuous/cidaemon
Removing contrib/ciabot/ciabot.sh
Removing contrib/ciabot/ciabot.py
Removing contrib/ciabot/README
Removing contrib/blameview/blameview.perl
Removing contrib/blameview/README
Auto-merging compat/winansi.c
CONFLICT (content): Merge conflict in compat/winansi.c
Removing compat/vcbuild/include/termios.h
Removing compat/vcbuild/include/sys/wait.h
Removing compat/vcbuild/include/sys/socket.h
Removing compat/vcbuild/include/sys/select.h
Removing compat/vcbuild/include/sys/poll.h
Removing compat/vcbuild/include/sys/ioctl.h
Removing compat/vcbuild/include/pwd.h
Removing compat/vcbuild/include/netinet/tcp.h
Removing compat/vcbuild/include/netinet/in.h
Removing compat/vcbuild/include/netdb.h
Removing compat/vcbuild/include/inttypes.h
Removing compat/vcbuild/include/grp.h
Removing compat/vcbuild/include/arpa/inet.h
Removing compat/strtok_r.c
Auto-merging compat/regex/regcomp.c
CONFLICT (content): Merge conflict in compat/regex/regcomp.c
Auto-merging compat/poll/poll.c
Auto-merging compat/nedmalloc/malloc.c.h
Auto-merging compat/mingw.h
CONFLICT (content): Merge conflict in compat/mingw.h
Auto-merging compat/mingw.c
CONFLICT (content): Merge conflict in compat/mingw.c
Auto-merging compat/inet_ntop.c
Removing compat/fnmatch/fnmatch.h
Removing compat/fnmatch/fnmatch.c
Removing compat/cygwin.h
Removing compat/cygwin.c
Auto-merging builtin/upload-archive.c
CONFLICT (content): Merge conflict in builtin/upload-archive.c
Removing builtin/tar-tree.c
Auto-merging builtin/mktag.c
CONFLICT (content): Merge conflict in builtin/mktag.c
Auto-merging builtin/fast-export.c
CONFLICT (content): Merge conflict in builtin/fast-export.c
Auto-merging alloc.c
CONFLICT (content): Merge conflict in alloc.c
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Removing Documentation/technical/api-strbuf.txt
Removing Documentation/technical/api-hash.txt
Removing Documentation/pt_BR/gittutorial.txt
Auto-merging Documentation/giteveryday.txt
Removing Documentation/git-tar-tree.txt
Removing Documentation/git-repo-config.txt
Removing Documentation/git-remote-helpers.txt
Removing Documentation/git-peek-remote.txt
Removing Documentation/git-lost-found.txt
Reply all
Reply to author
Forward
0 new messages