Merge "Explain a remote rejection of a non-fast-forward"

gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java
index fadd445..ac53830 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java
@@ -181,8 +181,15 @@
           break;
 
         case REJECTED_OTHER_REASON:
-          log.error("Failed replicate of " + u.getRemoteName() + " to " + uri
-              + ", reason: " + u.getMessage());
+          if ("non-fast-forward".equals(u.getMessage())) {
+            log.error("Failed replicate of " + u.getRemoteName() + " to " + uri
+                + ", remote rejected non-fast-forward push."
+                + "  Check receive.denyNonFastForwards variable in config file"
+                + " of destination repository.");
+          } else {
+            log.error("Failed replicate of " + u.getRemoteName() + " to " + uri
+                + ", reason: " + u.getMessage());
+          }
           break;
       }
     }