scripts: Add placeholders for OPTIONS_SPEC

[git.git] / builtin-branch.c

diff --git a/builtin-branch.c b/builtin-branch.c
index d6d5cff6b8cac21f2eb748751f9530e3b18c7246..3bf40f145378e06131a288d8234f123e0217a932 100644 (file)
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -148,7 +148,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
 
                if (!force &&
                    !in_merge_bases(rev, &head_rev, 1)) {
-                       error("The branch '%s' is not a strict subset of "
+                       error("The branch '%s' is not an ancestor of "
                                "your current HEAD.\n"
                                "If you are sure you want to delete it, "
                                "run 'git branch -D %s'.", argv[i], argv[i]);
@@ -282,7 +282,7 @@ static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
                commit = lookup_commit(item->sha1);
                if (commit && !parse_commit(commit)) {
                        pretty_print_commit(CMIT_FMT_ONELINE, commit,
-                                           &subject, 0, NULL, NULL, 0);
+                                           &subject, 0, NULL, NULL, 0, 0);
                        sub = subject.buf;
                }
                printf("%c %s%-*s%s %s %s\n", c, branch_get_color(color),