MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

git: cleanup

Browse Source
This commit is contained in:
Aleksey Pivovarov
2016-01-28 17:47:18 +03:00
parent be1f9289a1
commit 8b17f7b607
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
+3 -3
View File
@@ -171,7 +171,7 @@ public class GitAnnotationProvider implements AnnotationProviderEx, VcsCacheable
s.nextLine();
// parse commit information
CommitInfo commit = commits.get(commitHash);
if (commit != null) {
if (commit != null || commitHash == null) {
while (s.hasMoreData() && !s.startsWith('\t')) {
s.nextLine();
}
@@ -181,10 +181,10 @@ public class GitAnnotationProvider implements AnnotationProviderEx, VcsCacheable
while (s.hasMoreData() && !s.startsWith('\t')) {
String key = s.spaceToken();
String value = s.line();
if (commitHash != null && AUTHOR_KEY.equals(key)) {
if (AUTHOR_KEY.equals(key)) {
commit.author = value;
}
if (commitHash != null && COMMITTER_TIME_KEY.equals(key)) {
if (COMMITTER_TIME_KEY.equals(key)) {
commit.date = GitUtil.parseTimestamp(value);
commit.revision = new GitRevisionNumber(commitHash, commit.date);
}