summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2010-09-02 16:08:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-03 16:31:51 (GMT)
commit5e65ee35ddd306d6e6c86efc1c95315942f87811 (patch)
treeb9c0e49fc33aa4a2c3bec127f4e752aa6fe1fc8a /builtin/checkout.c
parente294030fe89efcdd92430b60cf9568ffbe7317a8 (diff)
downloadgit-5e65ee35ddd306d6e6c86efc1c95315942f87811.zip
git-5e65ee35ddd306d6e6c86efc1c95315942f87811.tar.gz
git-5e65ee35ddd306d6e6c86efc1c95315942f87811.tar.bz2
Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
Not only this makes the code clearer since setting up the porcelain error message is meant to work with show_all_errors, but this fixes a call to setup_unpack_trees_porcelain() in git_merge_trees() which did not set show_all_errors. add_rejected_path() used to double-check whether it was running in plumbing mode. This check was ineffective since it was setting show_all_errors too late for traverse_trees() to see it, and is made useless by this patch. Remove it. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r--builtin/checkout.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index f6caac1..f3dfb7b 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -392,7 +392,6 @@ static int merge_working_tree(struct checkout_opts *opts,
topts.dir = xcalloc(1, sizeof(*topts.dir));
topts.dir->flags |= DIR_SHOW_IGNORED;
topts.dir->exclude_per_dir = ".gitignore";
- topts.show_all_errors = 1;
tree = parse_tree_indirect(old->commit ?
old->commit->object.sha1 :
(unsigned char *)EMPTY_TREE_SHA1_BIN);