James Moger
2014-03-08 f1b8822f715ea00da6b7d39a8ea63864aeda2d39
src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -49,6 +49,7 @@
import org.apache.wicket.model.Model;
import org.apache.wicket.model.util.CollectionModel;
import org.apache.wicket.model.util.ListModel;
import org.eclipse.jgit.lib.Repository;
import com.gitblit.Constants;
import com.gitblit.Constants.AccessRestrictionType;
@@ -443,8 +444,16 @@
      // allow relinking HEAD to a branch or tag other than master on edit repository
      List<String> availableRefs = new ArrayList<String>();
      List<String> availableBranches = new ArrayList<String>();
      if (!ArrayUtils.isEmpty(repositoryModel.availableRefs)) {
         availableRefs.addAll(repositoryModel.availableRefs);
         for (String ref : repositoryModel.availableRefs) {
            if (!ref.startsWith(Constants.R_TICKET)) {
               availableRefs.add(ref);
               if (ref.startsWith(Constants.R_HEADS)) {
                  availableBranches.add(Repository.shortenRefName(ref));
               }
            }
         }
      }
      form.add(new DropDownChoice<String>("HEAD", availableRefs).setEnabled(availableRefs.size() > 0));
@@ -469,6 +478,7 @@
      form.add(new CheckBox("acceptNewPatchsets"));
      form.add(new CheckBox("acceptNewTickets"));
      form.add(new CheckBox("requireApproval"));
      form.add(new DropDownChoice<String>("mergeTo", availableBranches).setEnabled(availableBranches.size() > 0));
      form.add(new CheckBox("useIncrementalPushTags"));
      form.add(new CheckBox("showRemoteBranches"));
      form.add(new CheckBox("skipSizeCalculation"));