<style>
/* Changing the layout to use less space for mobiles */
@media screen and (max-device-width: 480px), screen and (-webkit-min-device-pixel-ratio: 2) {
#email-body { min-width: 30em !important; }
#email-page { padding: 8px !important; }
#email-banner { padding: 8px 8px 0 8px !important; }
#email-avatar { margin: 1px 8px 8px 0 !important; padding: 0 !important; }
#email-fields { padding: 0 8px 8px 8px !important; }
#email-gutter { width: 0 !important; }
}
</style>
<div id="email-body">
<table id="email-wrap" align="center" border="0" cellpadding="0" cellspacing="0" style="background-color:#f0f0f0;color:#000000;width:100%;">
<tr valign="top">
<td id="email-page" style="padding:16px !important;">
<table align="center" border="0" cellpadding="0" cellspacing="0" style="background-color:#ffffff;border:1px solid #bbbbbb;color:#000000;width:100%;">
<tr valign="top">
<td bgcolor="#3b4d64" style="background-color:#3b4d64;color:#ffffff;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:12px;line-height:1;"><img src="https://issues.jboss.org/s/en_US-g3yjjf/733/58/_/jira-logo-scaled.png" alt="" style="vertical-align:top;" /></td>
</tr><tr valign="top">
<td id="email-banner" style="padding:32px 32px 0 32px;">
<table align="left" border="0" cellpadding="0" cellspacing="0" width="100%" style="width:100%;">
<tr valign="top">
<td style="color:#505050;font-family:Arial,FreeSans,Helvetica,sans-serif;padding:0;">
<img id="email-avatar" src="https://community.jboss.org/people/adietish/avatar/16.png" alt="" height="48" width="48" border="0" align="left" style="padding:0;margin: 0 16px 16px 0;" />
<div id="email-action" style="padding: 0 0 8px 0;font-size:12px;line-height:18px;">
<a class="user-hover" rel="adietish" id="email_adietish" href="https://issues.jboss.org/secure/ViewProfile.jspa?name=adietish" style="color:#003366;">Andre Dietisheim</a>
updated <img src="https://issues.jboss.org/images/icons/bug.gif" height="16" width="16" border="0" align="absmiddle" alt="Bug"> <a style='color:#003366;text-decoration:none;' href='https://issues.jboss.org/browse/JBIDE-12150'>JBIDE-12150</a>
</div>
<div id="email-summary" style="font-size:16px;line-height:20px;padding:2px 0 16px 0;">
<a style='color:#003366;text-decoration:none;' href='https://issues.jboss.org/browse/JBIDE-12150'><strong>Git repository is sometimes corrupted after application creation</strong></a>
</div>
</td>
</tr>
</table>
</td>
</tr>
<tr valign="top">
<td id="email-fields" style="padding:0 32px 32px 32px;">
<table border="0" cellpadding="0" cellspacing="0" style="padding:0;text-align:left;width:100%;" width="100%">
<tr valign="top">
<td id="email-gutter" style="width:64px;white-space:nowrap;"></td>
<td>
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr valign="top">
<td style="color:#000000;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:12px;padding:0 10px 10px 0;white-space:nowrap;">
<strong style="font-weight:normal;color:#505050;">Change By:</strong>
</td>
<td style="color:#000000;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:12px;padding:0 0 10px 0;width:100%;">
<a class="user-hover" rel="adietish" id="email_adietish" href="https://issues.jboss.org/secure/ViewProfile.jspa?name=adietish" style="color:#003366;">Andre Dietisheim</a>
(13/Jun/12 10:17 AM)
</td>
</tr>
<tr valign="top">
<td style="color:#000000;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:12px;padding:0 10px 10px 0;white-space:nowrap;">
<strong style="font-weight:normal;color:#505050;">Description:</strong>
</td>
<td style="color:#000000;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:12px;padding:0 0 10px 0;width:100%;">
<span class="diffcontext">Steps to reproduce:<br><br></span>
<span class="diffaddedchars" style="background-color:#ddfade;">1) EXEC:</span>
<span class="diffcontext">create myapp in tools with openshift in ~/git/myapp<br></span>
<span class="diffaddedchars" style="background-color:#ddfade;">2) EXEC:</span>
<span class="diffcontext">take the git url and clone the app into a separate directory (to simulate other changes)<br>mkdir temp<br>cd temp<br>git clone ssh:<specifichost>/myapp.git/ <br>cd myapp<br></span>
<span class="diffaddedchars" style="background-color:#ddfade;">3) EXEC:</span>
<span class="diffcontext">edit README or some other existing file<br></span>
<span class="diffaddedchars" style="background-color:#ddfade;">4) EXEC:</span>
<span class="diffcontext">git commit -m "external change" README<br></span>
<span class="diffaddedchars" style="background-color:#ddfade;">5) EXEC:</span>
<span class="diffcontext">git push<br><ton of output><br><br></span>
<span class="diffaddedchars" style="background-color:#ddfade;">6) ASSERT: push now fails:</span>
<span class="diffcontext">cd ~/git/myapp<br>git push will now fail with something like:<br><br>$ git push ~/git/appmy<br>To ssh://b8ab8a46a2984d16b1666f3b172c4199@appmy-man.rhcloud.com/~/git/appmy.git/<br>! [rejected] master -> master (non-fast-forward)<br>error: failed to push some refs to 'ssh://b8ab8a46a2984d16b1666f3b172c4199@appmy-man.rhcloud.com/~/git/appmy.git/'<br>To prevent you from losing history, non-fast-forward updates were rejected<br>Merge the remote changes (e.g. 'git pull') before pushing again. See the<br>'Note about fast-forwards' section of 'git push --help' for details.<br><br>Thus when trying to publish from tools it should not let you push and it should ask you before pushing with force.<br><br></span>
<span class="diffaddedchars" style="background-color:#ddfade;">7) EXEC: Publish your app with the server adapter:<br></span>
<span class="diffcontext">After [https://issues.jboss.org/browse/JBIDE-12138] has been fixed, user is prompted with a dialog that proposes to perform a "push force".<br>While the operation seems to execute correctly, the following error is reported in the Error Log:<br><br>{code}<br>org.eclipse.jgit.api.errors.JGitInternalException: Exception caught during execution of push command<br> at org.eclipse.jgit.api.PushCommand.call(PushCommand.java:156)<br> at org.eclipse.egit.core.op.PushOperation.run(PushOperation.java:194)<br> at org.jboss.tools.openshift.egit.core.EGitUtils.push(EGitUtils.java:429)<br> at org.jboss.tools.openshift.egit.core.EGitUtils.pushForce(EGitUtils.java:418)<br> at org.jboss.tools.openshift.express.internal.core.behaviour.ExpressPublishMethod.commitAndPushProject(ExpressPublishMethod.java:237)<br> at org.jboss.tools.openshift.express.internal.core.behaviour.ExpressPublishMethod.publishFinish(ExpressPublishMethod.java:80)<br> at org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior.publishFinish(DeployableServerBehavior.java:94)<br> at org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior.publishFinish(DelegatingServerBehavior.java:147)<br> at org.eclipse.wst.server.core.model.ServerBehaviourDelegate.publish(ServerBehaviourDelegate.java:974)<br> at org.jboss.tools.openshift.express.internal.core.behaviour.ExpressBehaviour.publish(ExpressBehaviour.java:27)<br> at org.eclipse.wst.server.core.model.ServerBehaviourDelegate.publish(ServerBehaviourDelegate.java:774)<br> at org.jboss.tools.openshift.express.internal.core.behaviour.ExpressBehaviour.publish(ExpressBehaviour.java:34)<br> at org.eclipse.wst.server.core.internal.Server.publishImpl(Server.java:3087)<br> at org.eclipse.wst.server.core.internal.Server$PublishJob.run(Server.java:345)<br> at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)<br>Caused by: org.eclipse.jgit.errors.TransportException: ssh://7ddb1e3809e54c969a568dd03889e90f@as-minipaas.example.com/~/git/as.git/: Missing tree ecdd261c53993ae777f379662b52ceec35c2f7ed<br> at org.eclipse.jgit.transport.BasePackPushConnection.doPush(BasePackPushConnection.java:186)<br> at org.eclipse.jgit.transport.BasePackPushConnection.push(BasePackPushConnection.java:126)<br> at org.eclipse.jgit.transport.PushProcess.execute(PushProcess.java:141)<br> at org.eclipse.jgit.transport.Transport.push(Transport.java:1120)<br> at org.eclipse.jgit.api.PushCommand.call(PushCommand.java:152)<br> ... 14 more<br>Caused by: org.eclipse.jgit.errors.MissingObjectException: Missing tree ecdd261c53993ae777f379662b52ceec35c2f7ed<br> at org.eclipse.jgit.storage.file.WindowCursor.open(WindowCursor.java:126)<br> at org.eclipse.jgit.revwalk.ObjectWalk.newTreeVisit(ObjectWalk.java:726)<br> at org.eclipse.jgit.revwalk.ObjectWalk.nextObject(ObjectWalk.java:378)<br> at org.eclipse.jgit.storage.pack.PackWriter.findObjectsToPack(PackWriter.java:1706)<br> at org.eclipse.jgit.storage.pack.PackWriter.preparePack(PackWriter.java:707)<br> at org.eclipse.jgit.storage.pack.PackWriter.preparePack(PackWriter.java:670)<br> at org.eclipse.jgit.transport.BasePackPushConnection.writePack(BasePackPushConnection.java:265)<br> at org.eclipse.jgit.transport.BasePackPushConnection.doPush(BasePackPushConnection.java:168)<br> ... 18 more<br>{code}<br><br></span>
<span class="diffaddedchars" style="background-color:#ddfade;">Result:</span>
<span class="diffcontext"><br>Going back to cmdline, it seems that the git repository is corrupted:<br>{code}<br>$ git fsck<br>broken link from commit 70b2d1cf4705c118e5cac62d0c754df69f09fa32<br> to tree b0e5eab13c7d5ca0d3e5b22418234bfb2b57e91e<br>missing blob 244cfe40684de36646d426ace17041cd25605cb2<br>missing tree b0e5eab13c7d5ca0d3e5b22418234bfb2b57e91e<br>{code}<br><br>In the UI you'll see the following:<br>The *.settings* folder is not tracked, while the *.jsdtscope* within it is added & committed:<br><br>!settings-untracked-jsdtscope-committed.png!</span>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td><!-- End #email-page -->
</tr>
<tr valign="top">
<td style="color:#505050;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:10px;line-height:14px;padding: 0 16px 16px 16px;text-align:center;">
This message is automatically generated by JIRA.<br />
If you think it was sent incorrectly, please contact your <a style='color:#003366;' href='https://issues.jboss.org/secure/ContactAdministrators!default.jspa'>JIRA administrators</a>.<br />
For more information on JIRA, see: <a style='color:#003366;' href='http://www.atlassian.com/software/jira'>http://www.atlassian.com/software/jira</a>
</td>
</tr>
</table><!-- End #email-wrap -->
</div><!-- End #email-body -->