From 02ede7f11c6fb28ca53fc240905cd1b140236f08 Mon Sep 17 00:00:00 2001
From: Robin Rosenberg <robin.rosenberg@dewire.com>
Date: Sun, 01 Sep 2013 13:58:00 -0400
Subject: [PATCH] Avoid NPE when the default branch cannot be identified
---
src/test/java/com/gitblit/tests/Issue0259Test.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/Issue0259Test.java b/src/test/java/com/gitblit/tests/Issue0259Test.java
index 174f7cc..7267971 100644
--- a/src/test/java/com/gitblit/tests/Issue0259Test.java
+++ b/src/test/java/com/gitblit/tests/Issue0259Test.java
@@ -132,6 +132,11 @@
a.teams.add(t2);
}
+ // simulate a repository rename
+ a.setRepositoryPermission("projects/renamed.git", null);
+ t1.setRepositoryPermission("projects/renamed.git", null);
+ t2.setRepositoryPermission("projects/renamed.git", null);
+
assertEquals(AccessPermission.CLONE, a.getRepositoryPermission(test).permission);
assertEquals(AccessPermission.DELETE, a.getRepositoryPermission(projects_test).permission);
@@ -185,6 +190,10 @@
}
UserModel a = new UserModel("a");
a.teams.add(t1);
+
+ // simulate a repository rename
+ a.setRepositoryPermission("projects/renamed.git", null);
+ t1.setRepositoryPermission("projects/renamed.git", null);
assertEquals(AccessPermission.CLONE, a.getRepositoryPermission(test).permission);
assertTrue(a.canClone(test));
@@ -199,6 +208,6 @@
// R permission is found first
assertEquals(AccessPermission.CLONE, a.getRepositoryPermission(projects_test).permission);
assertFalse(a.canDeleteRef(projects_test));
- }
+ }
}
}
--
Gitblit v1.9.1