X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-checkout.c;h=fc55bbe14d58df66e71a9e1975bb7c4eecdc1a49;hb=78360b576acb0ee47c90552cb3f976a3c6ba4d6a;hp=c315f63398bac5dd3fd465af881caa5f3b9c9184;hpb=e785dadc90df20e1038c053dc168a6458b1e672b;p=git.git

diff --git a/builtin-checkout.c b/builtin-checkout.c
index c315f6339..fc55bbe14 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -407,7 +407,7 @@ static int merge_working_tree(struct checkout_opts *opts,
 		topts.verbose_update = !opts->quiet;
 		topts.fn = twoway_merge;
 		topts.dir = xcalloc(1, sizeof(*topts.dir));
-		topts.dir->show_ignored = 1;
+		topts.dir->flags |= DIR_SHOW_IGNORED;
 		topts.dir->exclude_per_dir = ".gitignore";
 		tree = parse_tree_indirect(old->commit->object.sha1);
 		init_tree_desc(&trees[0], tree->buffer, tree->size);
@@ -558,8 +558,8 @@ static int switch_branches(struct checkout_opts *opts, struct branch_info *new)
 
 	if (!old.commit && !opts->force) {
 		if (!opts->quiet) {
-			fprintf(stderr, "warning: You appear to be on a branch yet to be born.\n");
-			fprintf(stderr, "warning: Forcing checkout of %s.\n", new->name);
+			warning("You appear to be on a branch yet to be born.");
+			warning("Forcing checkout of %s.", new->name);
 		}
 		opts->force = 1;
 	}