Fixed bug in merge: improper use of force and failing on FORCED result

James Moger

2014-03-06 d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd

Fixed bug in merge: improper use of force and failing on FORCED result

 src/main/java/com/gitblit/utils/JGitUtils.java

@@ -2329,7 +2329,7 @@
                    RefUpdate mergeRefUpdate = repository.updateRef(toBranch);
                    mergeRefUpdate.setNewObjectId(mergeCommitId);
                    mergeRefUpdate.setRefLogMessage("commit: " + mergeCommit.getShortMessage(), false);
                    RefUpdate.Result rc = mergeRefUpdate.forceUpdate();
                    RefUpdate.Result rc = mergeRefUpdate.update();
                    switch (rc) {
                    case FAST_FORWARD:
                        // successful, clean merge