Switch to -u from deprecated --set-upstream

James Moger

2014-05-05 d69d73e5da5a12f279d5c0c38c871801739f33d6

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

@@ -2256,8 +2256,10 @@
         }
      } catch (IOException e) {
         LOGGER.error("Failed to determine canMerge", e);
      } finally {
         revWalk.release();
      } finally {

         if (revWalk != null) {
            revWalk.release();

         }
      }
      return MergeStatus.NOT_MERGEABLE;
   }
@@ -2347,8 +2349,10 @@
         }
      } catch (IOException e) {
         LOGGER.error("Failed to merge", e);
      } finally {
         revWalk.release();
      } finally {

         if (revWalk != null) {
            revWalk.release();

         }
      }
      return new MergeResult(MergeStatus.FAILED, null);
   }