opendev/gerrit
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Shawn O. Pearce
2010-05-27 15:28:24 -07:00
committed by Android Code Review
parent daf116fc31 dda868c8d0
commit 7e6d9808db
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,8 +181,15 @@ class PushOp implements ProjectRunnable {
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;
}
}