From 1b0e0503d94d0b8c7f4c6ea70783770b9e76f5f8 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 02 Jul 2013 21:18:46 -0400 Subject: [PATCH] Unit tests which confirm working/expected behavior (issue-259) --- src/main/java/com/gitblit/utils/RefLogUtils.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/utils/RefLogUtils.java b/src/main/java/com/gitblit/utils/RefLogUtils.java index 0dd6652..643fbc0 100644 --- a/src/main/java/com/gitblit/utils/RefLogUtils.java +++ b/src/main/java/com/gitblit/utils/RefLogUtils.java @@ -184,7 +184,7 @@ PersonIdent ident; if (UserModel.ANONYMOUS.equals(user)) { // anonymous push - ident = new PersonIdent("anonymous", "anonymous"); + ident = new PersonIdent(user.username + "/" + user.username, user.username); } else { // construct real pushing account ident = new PersonIdent(MessageFormat.format("{0}/{1}", user.getDisplayName(), user.username), @@ -554,6 +554,7 @@ } String branch = local.getName(); List<RepositoryCommit> commits = CommitCache.instance().getCommits(repositoryName, repository, branch, minimumDate); + linearParent = null; for (RepositoryCommit commit : commits) { if (linearParent != null) { if (!commit.getName().equals(linearParent)) { -- Gitblit v1.9.1