From fe7c01a8bd76dff240e74bb770212911e227ba59 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 03 Feb 2012 17:24:51 -0500 Subject: [PATCH] Return to Users page after add/edit team --- src/com/gitblit/GitBlit.java | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java index 7216126..a689b48 100644 --- a/src/com/gitblit/GitBlit.java +++ b/src/com/gitblit/GitBlit.java @@ -786,8 +786,8 @@ model.mailingLists = new ArrayList<String>(Arrays.asList(config.getStringList( "gitblit", null, "mailingList"))); } - model.defaultHead = JGitUtils.getSymbolicHeadTarget(r); - model.availableHeads = JGitUtils.getAvailableHeadTargets(r); + model.HEAD = JGitUtils.getHEADRef(r); + model.availableRefs = JGitUtils.getAvailableHeadTargets(r); r.close(); return model; } @@ -984,10 +984,17 @@ if (r != null) { updateConfiguration(r, repository); // only update symbolic head if it changes - if (!StringUtils.isEmpty(repository.defaultHead) && - !repository.defaultHead.equals(JGitUtils.getSymbolicHeadTarget(r))) { - JGitUtils.setSymbolicHeadTarget(r, repository.defaultHead); + String currentRef = JGitUtils.getHEADRef(r); + if (!StringUtils.isEmpty(repository.HEAD) && !repository.HEAD.equals(currentRef)) { + logger.info(MessageFormat.format("Relinking {0} HEAD from {1} to {2}", + repository.name, currentRef, repository.HEAD)); + if (JGitUtils.setHEADtoRef(r, repository.HEAD)) { + // clear the cache + clearRepositoryCache(repository.name); + } } + + // close the repository object r.close(); } } -- Gitblit v1.9.1