opendev/gerrit
Code Issues Proposed changes

Merge "Skip non-commits when verifying access for 'add branch' operation" into stable-2.6

Browse Source
This commit is contained in:
Edwin Kempin 2013-10-05 07:29:05 +00:00 committed by Gerrit Code Review
commit ac3ba6aad5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java
View File

@ -40,6 +40,7 @@ import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
@ -468,7 +469,12 @@ public class ProjectControl {
Repository repo = repoManager.openRepository(projName);
try {
for (Entry<String, Ref> entry : repo.getAllRefs().entrySet()) {
RevCommit tip = rw.parseCommit(entry.getValue().getObjectId());
RevCommit tip;
try {
tip = rw.parseCommit(entry.getValue().getObjectId());
} catch (IncorrectObjectTypeException e) {
continue;
}
if (rw.isMergedInto(commit, tip)
&& controlForRef(entry.getKey()).canPerform(Permission.READ)) {
return true;