Merge branch 'maint'

diff --git a/contrib/examples/builtin-fetch--tool.c b/contrib/examples/builtin-fetch--tool.c
index 3dbdf7a2887002f0d7a67a1db35bd3c72d7a9d30..3140e405fa130a0fa20b2f6ee4171da70935de66 100644 (file)
--- a/contrib/examples/builtin-fetch--tool.c
+++ b/contrib/examples/builtin-fetch--tool.c
@@ -97,21 +97,21 @@ static int update_local_ref(const char *name,
        strcpy(newh, find_unique_abbrev(sha1_new, DEFAULT_ABBREV));
 
        if (in_merge_bases(current, &updated, 1)) {
-               fprintf(stderr, "* %s: fast forward to %s\n",
+               fprintf(stderr, "* %s: fast-forward to %s\n",
                        name, note);
                fprintf(stderr, "  old..new: %s..%s\n", oldh, newh);
-               return update_ref_env("fast forward", name, sha1_new, sha1_old);
+               return update_ref_env("fast-forward", name, sha1_new, sha1_old);
        }
        if (!force) {
                fprintf(stderr,
-                       "* %s: not updating to non-fast forward %s\n",
+                       "* %s: not updating to non-fast-forward %s\n",
                        name, note);
                fprintf(stderr,
                        "  old...new: %s...%s\n", oldh, newh);
                return 1;
        }
        fprintf(stderr,
-               "* %s: forcing update to non-fast forward %s\n",
+               "* %s: forcing update to non-fast-forward %s\n",
                name, note);
        fprintf(stderr, "  old...new: %s...%s\n", oldh, newh);
        return update_ref_env("forced-update", name, sha1_new, sha1_old);
@@ -148,7 +148,7 @@ static int append_fetch_head(FILE *fp,
                what = remote_name + 10;
        }
        else if (!strncmp(remote_name, "refs/remotes/", 13)) {
-               kind = "remote branch";
+               kind = "remote-tracking branch";
                what = remote_name + 13;
        }
        else {