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

This commit is contained in:
Shawn O. Pearce
2010-05-27 15:28:24 -07:00
committed by Android Code Review

View File

@@ -181,8 +181,15 @@ class PushOp implements ProjectRunnable {
break; break;
case REJECTED_OTHER_REASON: case REJECTED_OTHER_REASON:
log.error("Failed replicate of " + u.getRemoteName() + " to " + uri if ("non-fast-forward".equals(u.getMessage())) {
+ ", reason: " + 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; break;
} }
} }