Merge branch 'stable-1.1'

* stable-1.1:
  Prepare post v1.1.0.201109151100-r build
  JGit v1.1.0.201109151100-r

Change-Id: I31a2e8d26d635ded9ea956a26ad9b2d9e20862a1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2011-09-15 22:51:28 +02:00
commit 05c7896919
1 changed files with 1 additions and 1 deletions

View File

@ -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)) {