From cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Jan 2012 17:34:05 -0500
Subject: [PATCH] Fixed bug in receive hook for repositories in subfolders
---
src/com/gitblit/wicket/pages/PatchPage.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/PatchPage.java b/src/com/gitblit/wicket/pages/PatchPage.java
index 9d032ca..0493473 100644
--- a/src/com/gitblit/wicket/pages/PatchPage.java
+++ b/src/com/gitblit/wicket/pages/PatchPage.java
@@ -22,6 +22,7 @@
import org.eclipse.jgit.revwalk.RevCommit;
import com.gitblit.GitBlit;
+import com.gitblit.utils.DiffUtils;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebSession;
@@ -37,7 +38,7 @@
redirectToInterceptPage(new RepositoriesPage());
return;
}
-
+
final String repositoryName = WicketUtils.getRepositoryName(params);
final String baseObjectId = WicketUtils.getBaseObjectId(params);
final String objectId = WicketUtils.getObject(params);
@@ -56,14 +57,12 @@
redirectToInterceptPage(new RepositoriesPage());
return;
}
-
- String patch;
- if (StringUtils.isEmpty(baseObjectId)) {
- patch = JGitUtils.getCommitPatch(r, commit, blobPath);
- } else {
- RevCommit baseCommit = JGitUtils.getCommit(r, baseObjectId);
- patch = JGitUtils.getCommitPatch(r, baseCommit, commit, blobPath);
+
+ RevCommit baseCommit = null;
+ if (!StringUtils.isEmpty(baseObjectId)) {
+ baseCommit = JGitUtils.getCommit(r, baseObjectId);
}
+ String patch = DiffUtils.getCommitPatch(r, baseCommit, commit, blobPath);
add(new Label("patchText", patch));
r.close();
}
--
Gitblit v1.9.1