diff options
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/gitblit/GitBlit.java | 2 | ||||
| -rw-r--r-- | src/com/gitblit/utils/JGitUtils.java | 36 | ||||
| -rw-r--r-- | src/com/gitblit/wicket/pages/SummaryPage.java | 2 |
3 files changed, 18 insertions, 22 deletions
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java index 7fb325c6..a57e6055 100644 --- a/src/com/gitblit/GitBlit.java +++ b/src/com/gitblit/GitBlit.java @@ -780,7 +780,7 @@ public class GitBlit implements ServletContextListener { RepositoryModel model = new RepositoryModel();
model.name = repositoryName;
model.hasCommits = JGitUtils.hasCommits(r);
- model.lastChange = JGitUtils.getLastChange(r, null);
+ model.lastChange = JGitUtils.getLastChange(r);
model.isBare = r.isBare();
StoredConfig config = JGitUtils.readConfig(r);
if (config != null) {
diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java index a9b99a93..5f193d02 100644 --- a/src/com/gitblit/utils/JGitUtils.java +++ b/src/com/gitblit/utils/JGitUtils.java @@ -423,11 +423,9 @@ public class JGitUtils { * last modified date of the repository folder is returned.
*
* @param repository
- * @param branch
- * if unspecified, all branches are checked.
* @return
*/
- public static Date getLastChange(Repository repository, String branch) {
+ public static Date getLastChange(Repository repository) {
if (!hasCommits(repository)) {
// null repository
if (repository == null) {
@@ -436,26 +434,21 @@ public class JGitUtils { // fresh repository
return new Date(repository.getDirectory().lastModified());
}
- if (StringUtils.isEmpty(branch)) {
- List<RefModel> branchModels = getLocalBranches(repository, true, -1);
- if (branchModels.size() > 0) {
- // find most recent branch update
- Date lastChange = new Date(0);
- for (RefModel branchModel : branchModels) {
- if (branchModel.getDate().after(lastChange)) {
- lastChange = branchModel.getDate();
- }
+
+ List<RefModel> branchModels = getLocalBranches(repository, true, -1);
+ if (branchModels.size() > 0) {
+ // find most recent branch update
+ Date lastChange = new Date(0);
+ for (RefModel branchModel : branchModels) {
+ if (branchModel.getDate().after(lastChange)) {
+ lastChange = branchModel.getDate();
}
- return lastChange;
- } else {
- // try to find head
- branch = Constants.HEAD;
}
+ return lastChange;
}
-
- // lookup specified branch
- RevCommit commit = getCommit(repository, branch);
- return getCommitDate(commit);
+
+ // default to the repository folder modification date
+ return new Date(repository.getDirectory().lastModified());
}
/**
@@ -962,6 +955,9 @@ public class JGitUtils { } else {
branchObject = repository.resolve(objectId);
}
+ if (branchObject == null) {
+ return list;
+ }
RevWalk rw = new RevWalk(repository);
rw.markStart(rw.parseCommit(branchObject));
diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java index acb41808..12371f77 100644 --- a/src/com/gitblit/wicket/pages/SummaryPage.java +++ b/src/com/gitblit/wicket/pages/SummaryPage.java @@ -84,7 +84,7 @@ public class SummaryPage extends RepositoryPage { add(new Label("repositoryOwner", getRepositoryModel().owner));
add(WicketUtils.createTimestampLabel("repositoryLastChange",
- JGitUtils.getLastChange(r, null), getTimeZone()));
+ JGitUtils.getLastChange(r), getTimeZone()));
if (metricsTotal == null) {
add(new Label("branchStats", ""));
} else {
|