Merge branch 'stable-1.1'
* stable-1.1: Allow commit when submodule changes are present Ignore submodule on checkout instead of deleting it cleanup: Reuse local variable for current DirCacheEntry Prepare post v1.1.0.201109071825-rc3 builds JGit v1.1.0.201109071825-rc3 Use commit message best practices for Mylyn Commit template Change-Id: I6ab9e5cb48c036d2ee2e548f5ec040d93672d8ad Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
commit
cc4e6109e4
|
@ -597,7 +597,7 @@ private ObjectId resolveSimple(final String revstr) throws IOException {
|
|||
return resolveAbbreviation(revstr);
|
||||
|
||||
int dashg = revstr.indexOf("-g");
|
||||
if (4 < revstr.length() && 0 <= dashg
|
||||
if ((dashg + 4) < revstr.length() && 0 <= dashg
|
||||
&& isHex(revstr.charAt(dashg + 2))
|
||||
&& isHex(revstr.charAt(dashg + 3))
|
||||
&& isAllHex(revstr, dashg + 4)) {
|
||||
|
|
Loading…
Reference in New Issue