diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/push.c | 2 | ||||
| -rw-r--r-- | builtin/send-pack.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/builtin/push.c b/builtin/push.c index e08485d123..83a3cc80c3 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -222,7 +222,7 @@ static const char message_advice_checkout_pull_push[] = static const char message_advice_ref_already_exists[] = N_("Updates were rejected because the destination reference already exists\n" - "in the remote and the update is not a fast-forward."); + "in the remote."); static void advise_pull_before_push(void) { diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 9f986077aa..f849e0a4a0 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -44,6 +44,11 @@ static void print_helper_status(struct ref *ref) msg = "non-fast forward"; break; + case REF_STATUS_REJECT_ALREADY_EXISTS: + res = "error"; + msg = "already exists"; + break; + case REF_STATUS_REJECT_NODELETE: case REF_STATUS_REMOTE_REJECT: res = "error"; |