Merge branch 'sp/smart-http'

diff --git a/builtin-send-pack.c b/builtin-send-pack.c
index a0fbad0f610098d283babb7046d3ff07bd3805cb..d26997bcfe28f113e3de63b43ecadb812dbd027e 100644 (file)
--- a/builtin-send-pack.c
+++ b/builtin-send-pack.c
@@ -262,7 +262,7 @@ static int print_one_push_status(struct ref *ref, const char *dest, int count)
                break;
        case REF_STATUS_REJECT_NONFASTFORWARD:
                print_ref_status('!', "[rejected]", ref, ref->peer_ref,
-                               "non-fast forward");
+                               "non-fast-forward");
                break;
        case REF_STATUS_REMOTE_REJECT:
                print_ref_status('!', "[remote rejected]", ref,