diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2011-09-15 22:51:28 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2011-09-15 22:51:28 +0200 |
| commit | 05c789691929983ca70c96f7421182f4501e961a (patch) | |
| tree | 16a96b03bb1ebfce42dc5046f6fdd65f66066f41 | |
| parent | 57d6585522af279d311b11af64339c209c08f6be (diff) | |
| parent | cc4e6109e40ac6f761b302b24bd6a793393090d5 (diff) | |
| download | jgit-05c789691929983ca70c96f7421182f4501e961a.tar.gz jgit-05c789691929983ca70c96f7421182f4501e961a.zip | |
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>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java index b51a954ca9..3a3e1c558f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java @@ -597,7 +597,7 @@ public abstract class Repository { 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)) { |