From 30f9d25d77ccb5cd978d4cf8fa389ec819e90e95 Mon Sep 17 00:00:00 2001
From: Philip L. McMahon <philip.l.mcmahon@gmail.com>
Date: Fri, 27 Jan 2012 02:02:19 -0500
Subject: [PATCH] Correct update of HEAD symbolic reference when target is a tag.
---
src/com/gitblit/utils/GitWebDiffFormatter.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/utils/GitWebDiffFormatter.java b/src/com/gitblit/utils/GitWebDiffFormatter.java
index 97d6bf8..00ea121 100644
--- a/src/com/gitblit/utils/GitWebDiffFormatter.java
+++ b/src/com/gitblit/utils/GitWebDiffFormatter.java
@@ -24,6 +24,12 @@
import org.eclipse.jgit.diff.DiffFormatter;
import org.eclipse.jgit.diff.RawText;
+/**
+ * Returns an html snippet of the diff in the standard Gitweb style.
+ *
+ * @author James Moger
+ *
+ */
public class GitWebDiffFormatter extends DiffFormatter {
private final OutputStream os;
@@ -47,7 +53,8 @@
* @throws IOException
*/
@Override
- protected void writeHunkHeader(int aStartLine, int aEndLine, int bStartLine, int bEndLine) throws IOException {
+ protected void writeHunkHeader(int aStartLine, int aEndLine, int bStartLine, int bEndLine)
+ throws IOException {
os.write("<div class=\"diff hunk_header\"><span class=\"diff hunk_info\">".getBytes());
os.write('@');
os.write('@');
@@ -93,7 +100,8 @@
}
@Override
- protected void writeLine(final char prefix, final RawText text, final int cur) throws IOException {
+ protected void writeLine(final char prefix, final RawText text, final int cur)
+ throws IOException {
switch (prefix) {
case '+':
os.write("<span class=\"diff add\">".getBytes());
--
Gitblit v1.9.1