Merge branch 'tr/filter-branch'

diff --git a/builtin-receive-pack.c b/builtin-receive-pack.c
index e8bde02c271ace4745e245b001652b3b96d798f5..b6895d3f992f17e215d98f185a024a3e4041e507 100644 (file)
--- a/builtin-receive-pack.c
+++ b/builtin-receive-pack.c
@@ -341,9 +341,9 @@ static const char *update(struct command *cmd)
                                break;
                free_commit_list(bases);
                if (!ent) {
-                       error("denying non-fast forward %s"
+                       error("denying non-fast-forward %s"
                              " (you should pull first)", name);
-                       return "non-fast forward";
+                       return "non-fast-forward";
                }
        }
        if (run_update_hook(cmd)) {