<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-12138'>JBIDE-12138</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-12138'><strong>serveradapter is git forcing without asking when error occurs in normal git commit</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:47 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">Was noticed through reading the code that if another error than "up to date" occurs jbosstools is *forcing* a push witohut asking the user.<br><br>This must be fixed since otherwise you are nuking users history!<br><br>Steps to reproduce:<br><br>1) EXEC: create myapp in tools with openshift in ~/git/myapp<br><br>2) EXEC: take the git url and clone the app into a separate directory (to simulate other changes)<br>mkdir temp (different directory than the git-repo created by our tooling!!)<br>cd temp<br>git clone ssh:<specifichost>/myapp.git/ <br>cd myapp<br>3) EXEC: edit README or some other existing file<br>4) EXEC: git commit -m "external change" README<br>5) EXEC: git push<br><br><ton of output><br><br>6) ASSERT: (verifying that now pushing from the repo created by our tooling is now failing because of "non-fastforward"):<br>cd ~/git/myapp<br></span>
<span class="diffaddedchars" style="background-color:#ddfade;">echo "-------------" > README (or change README manually with vim<br></span>
<span class="diffcontext">git push will now fail with something like:<br><br>ax@slowbeard: $ 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>Result:<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>You can verify it did not push force by using <br><br>git pull<br>git log README<br><br>and check that "external change" is still present.</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 -->