From 47d16163747e322b2445887e1436e0f766649c34 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 6 Dec 2011 09:37:11 -0800
Subject: Use constant for logs directory

Change-Id: Ie139133bcbe1ca61c85e86b3484f858bc065821f
---
 org.eclipse.jgit/src/org/eclipse/jgit/storage/file/ReflogReader.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/ReflogReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/ReflogReader.java
index 1b7fc23e73..cec48f5160 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/ReflogReader.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/ReflogReader.java
@@ -51,6 +51,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.util.IO;
 import org.eclipse.jgit.util.RawParseUtils;
@@ -66,7 +67,7 @@ public class ReflogReader {
 	 * @param refname
 	 */
 	public ReflogReader(Repository db, String refname) {
-		logName = new File(db.getDirectory(), "logs/" + refname);
+		logName = new File(db.getDirectory(), Constants.LOGS + '/' + refname);
 	}
 
 	/**
-- 
cgit v1.2.3


From 4535a9e2a32c0c3b9f74c76998474fae4e57b321 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Tue, 6 Dec 2011 10:00:28 -0800
Subject: Throw invalid ref exception instead of invalid remote exception

ReflogCommand command was throwing an incorrect exception type
when an IOException was wrapped and rethrown from the underlying
ReflogReader.  The IOException cause is now provided to the thrown
exception as well.

Change-Id: I9f1842c2d414d3e9c658843f9b448bc18891748e
---
 org.eclipse.jgit/src/org/eclipse/jgit/api/ReflogCommand.java      | 6 +++---
 .../src/org/eclipse/jgit/api/errors/InvalidRefNameException.java  | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ReflogCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ReflogCommand.java
index bd16e3f912..8d0720742f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ReflogCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ReflogCommand.java
@@ -47,7 +47,7 @@ import java.text.MessageFormat;
 import java.util.Collection;
 
 import org.eclipse.jgit.JGitText;
-import org.eclipse.jgit.api.errors.InvalidRemoteException;
+import org.eclipse.jgit.api.errors.InvalidRefNameException;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.storage.file.ReflogEntry;
@@ -91,8 +91,8 @@ public class ReflogCommand extends GitCommand<Collection<ReflogEntry>> {
 			ReflogReader reader = new ReflogReader(repo, ref);
 			return reader.getReverseEntries();
 		} catch (IOException e) {
-			throw new InvalidRemoteException(MessageFormat.format(
-					JGitText.get().cannotRead, ref));
+			throw new InvalidRefNameException(MessageFormat.format(
+					JGitText.get().cannotRead, ref), e);
 		}
 	}
 
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidRefNameException.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidRefNameException.java
index 139c41cd5f..287713c82c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidRefNameException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidRefNameException.java
@@ -49,4 +49,12 @@ public class InvalidRefNameException extends GitAPIException {
 	public InvalidRefNameException(String msg) {
 		super(msg);
 	}
+
+	/**
+	 * @param msg
+	 * @param cause
+	 */
+	public InvalidRefNameException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
 }
-- 
cgit v1.2.3