diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2011-09-11 22:43:41 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2011-09-11 22:43:41 +0200 |
| commit | cc4e6109e40ac6f761b302b24bd6a793393090d5 (patch) | |
| tree | 16a96b03bb1ebfce42dc5046f6fdd65f66066f41 | |
| parent | a7d3c680151aa27608c6381db0983b51828c2358 (diff) | |
| parent | 570d862ef3874e39a378a0268b120aeb02aa7718 (diff) | |
| download | jgit-cc4e6109e40ac6f761b302b24bd6a793393090d5.tar.gz jgit-cc4e6109e40ac6f761b302b24bd6a793393090d5.zip | |
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>
| -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)) { |