From b695f66487dfdc5cfe3e3dd22c0253801ecdc9b9 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Sun, 4 Sep 2011 11:12:49 +0200 Subject: [PATCH] Fix the names in the reflog for checkouts We were diverging from the reference implementation. Always use the ref we checkout to as the to-branch the reflog and avoid the refs/heads both in the from-name and to-name. Change-Id: Id973d9102593872e4df41d0788f0eb7c7fd130c4 Signed-off-by: Robin Rosenberg Signed-off-by: Matthias Sohn --- .../src/org/eclipse/jgit/api/CheckoutCommand.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java index 8caff0629..dd9f0c456 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java @@ -143,8 +143,8 @@ public Ref call() throws JGitInternalException, RefAlreadyExistsException, } Ref headRef = repo.getRef(Constants.HEAD); - String refLogMessage = "checkout: moving from " - + headRef.getTarget().getName(); + String shortHeadRef = getShortBranchName(headRef); + String refLogMessage = "checkout: moving from " + shortHeadRef; ObjectId branch = repo.resolve(name); if (branch == null) throw new RefNotFoundException(MessageFormat.format(JGitText @@ -169,10 +169,10 @@ public Ref call() throws JGitInternalException, RefAlreadyExistsException, Ref ref = repo.getRef(name); if (ref != null && !ref.getName().startsWith(Constants.R_HEADS)) ref = null; + String toName = Repository.shortenRefName(name); RefUpdate refUpdate = repo.updateRef(Constants.HEAD, ref == null); refUpdate.setForceUpdate(force); - refUpdate.setRefLogMessage(refLogMessage + " to " - + newCommit.getName(), false); + refUpdate.setRefLogMessage(refLogMessage + " to " + toName, false); Result updateResult; if (ref != null) updateResult = refUpdate.link(ref.getName()); @@ -216,6 +216,12 @@ public Ref call() throws JGitInternalException, RefAlreadyExistsException, } } + private String getShortBranchName(Ref headRef) { + if (headRef.getTarget().getName().equals(headRef.getName())) + return headRef.getTarget().getObjectId().getName(); + return Repository.shortenRefName(headRef.getTarget().getName()); + } + /** * @param path * Path to update in the working tree and index.