[emfcompare-build] [Hudson] Build failed in Hudson: jgit.hooks-master-ni

[hudsonbuild@xxxxxxxxxxx]

See <https://hudson.eclipse.org/emfcompare/job/jgit.hooks-master-nighly/46/changes>

Changes:

[Christian Halstrick] Refactored pre-commit hook to make it less invasive.

[Matthias Sohn] Support for the commit-msg hook.

[Shawn Pearce] Allow public access to PackIndex

------------------------------------------
Started by an SCM change
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/jgit.hooks-master-nighly/ws/> - hudson.remoting.LocalChannel@60ae87e
Using strategy: Default
Last Built Revision: Revision 12a55c34753669365d9e644e592d9d8c10e742f1 (origin/master)
Checkout:workspace / <https://hudson.eclipse.org/emfcompare/job/jgit.hooks-master-nighly/ws/> - hudson.remoting.LocalChannel@60ae87e
Fetching changes from the remote Git repository
Fetching upstream changes from /gitroot/jgit/jgit.git
Commencing build of Revision a8fb77853a97568dc03ca9513eadb01bb2b50c06 (origin/master)
Checking out Revision a8fb77853a97568dc03ca9513eadb01bb2b50c06 (origin/master)
[workspace] $ /bin/sh -xe /tmp/genie.emfcompare/hudson1563774719573408443.sh
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/35791'
>> Cherry-picking https://git.eclipse.org/r/#/c/35791
+ git fetch git://git.eclipse.org/gitroot/jgit/jgit refs/changes/91/35791/5
>From git://git.eclipse.org/gitroot/jgit/jgit
 * branch            refs/changes/91/35791/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 6dc669c] Support for the post-commit hook
 Author: Laurent Goubet <laurent.goubet@xxxxxxx>
 2 files changed, 105 insertions(+), 2 deletions(-)
 create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/api/HookFailureHandler.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/35815'
>> Cherry-picking https://git.eclipse.org/r/#/c/35815
+ git fetch git://git.eclipse.org/gitroot/jgit/jgit refs/changes/15/35815/5
>From git://git.eclipse.org/gitroot/jgit/jgit
 * branch            refs/changes/15/35815/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
[detached HEAD 130bcde] Support for the pre-rebase hook
 Author: Laurent Goubet <laurent.goubet@xxxxxxx>
 4 files changed, 92 insertions(+)
 create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/api/errors/RejectRebaseException.java
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/35792'
>> Cherry-picking https://git.eclipse.org/r/#/c/35792
+ git fetch git://git.eclipse.org/gitroot/jgit/jgit refs/changes/92/35792/6
>From git://git.eclipse.org/gitroot/jgit/jgit
 * branch            refs/changes/92/35792/6 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply 46a6fa2... Support for the post-rewrite hook
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
+ true
+ sed '/<<<<<<< HEAD\|>>>>>>> .*/d' org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
+ perl -pi.bak -e 's|=======|\t/**\n|g' sed.tmp
+ perl -pe 'BEGIN{undef $/;} s/public RebaseCommand setHookOutputStream.*?}//sm' sed.tmp
+ mv RebaseTMP org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
+ rm sed.tmp
+ rm sed.tmp.bak
+ git add org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
+ perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' .git/MERGE_MSG
+ git commit -F .git/MERGE_MSG
[detached HEAD c1b4d45] Support for the post-rewrite hook
 Author: Laurent Goubet <laurent.goubet@xxxxxxx>
 2 files changed, 157 insertions(+), 17 deletions(-)
+ echo '>> Cherry-picking https://git.eclipse.org/r/#/c/35790'
>> Cherry-picking https://git.eclipse.org/r/#/c/35790
+ git fetch git://git.eclipse.org/gitroot/jgit/jgit refs/changes/90/35790/5
>From git://git.eclipse.org/gitroot/jgit/jgit
 * branch            refs/changes/90/35790/5 -> FETCH_HEAD
+ git cherry-pick FETCH_HEAD
error: could not apply a4d509b... Support for the commit-msg hook
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
+ true
+ sed '/<<<<<<< HEAD\|>>>>>>> .*/d' org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
+ perl -pi.bak -e 's|=======|\t}\n|g' sed.tmp
+ mv sed.tmp org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
+ rm sed.tmp.bak
+ git add org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
+ perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' .git/MERGE_MSG
+ git commit -F .git/MERGE_MSG
error: 'commit' is not possible because you have unmerged files.
hint: Fix them up in the work tree,
hint: and then use 'git add/rm <file>' as
hint: appropriate to mark resolution and make a commit,
hint: or use 'git commit -a'.
fatal: Exiting because of an unresolved conflict.
U	org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
Archiving artifacts

--
This message is automatically generated by Hudson. 
For more information on Hudson, see: http://hudson-ci.org/