[Monotone-commits-diffs] net.venge.monotone.issue-148-80: fff999548e6d92a4d16280c7bfc346dff5353274

[code]

revision:            fff999548e6d92a4d16280c7bfc346dff5353274
date:                2012-08-07T12:07:31
author:              address@hidden
branch:              net.venge.monotone.issue-148-80
changelog:
* src/work.cc (addition_builder::visit_dir): clarify result

manifest:
format_version "1"

new_manifest [375954e3408aa947b152cb2f3e3945ee0fc98d11]

old_revision [5b75e024b5f764b49703ce0135328fc5f78834b6]

patch "src/work.cc"
 from [82c6964129b93b16d99da1dc34d241dedda570d5]
   to [8d3836724bbef0b606fad9c200d85126c9462565]
============================================================
--- src/work.cc	82c6964129b93b16d99da1dc34d241dedda570d5
+++ src/work.cc	8d3836724bbef0b606fad9c200d85126c9462565
@@ -1145,7 +1145,9 @@ addition_builder::visit_dir(file_path co
 addition_builder::visit_dir(file_path const & path)
 {
   this->visit_file(path);
-  return recursive && (!respect_ignore || !work.ignore_file(path));
+  // when --recursive, don't recurse into ignored dirs (it would just waste time)
+  // when --no-recursive, this result is ignored (see workspace::perform_additions)
+  return !work.ignore_file(path);
 }
 
 void