# # # add_dir "tests/add_unknown_ignored" # # add_file "tests/add_unknown_ignored/__driver__.lua" # content [37f44506da31f5728124d3f9df09681945a63f54] # # patch "cmd_ws_commit.cc" # from [8d1fcea9995a4ec8b88e26fcb5bf138531939884] # to [cce91ef91465c3b3e52dec3a85b919b77aa8ee54] # ============================================================ --- tests/add_unknown_ignored/__driver__.lua 37f44506da31f5728124d3f9df09681945a63f54 +++ tests/add_unknown_ignored/__driver__.lua 37f44506da31f5728124d3f9df09681945a63f54 @@ -0,0 +1,9 @@ + +mtn_setup() + +check(mtn("add", "--unknown"), 0, false, false) +check(mtn("ls", "known"), 0, true, false) +check(not qgrep("test_hooks.lua", "stdout")) +check(mtn("add", "--unknown", "--no-respect-ignore"), 0, false, false) +check(mtn("ls", "known"), 0, true, false) +check(qgrep("test_hooks.lua", "stdout")) ============================================================ --- cmd_ws_commit.cc 8d1fcea9995a4ec8b88e26fcb5bf138531939884 +++ cmd_ws_commit.cc cce91ef91465c3b3e52dec3a85b919b77aa8ee54 @@ -314,12 +314,11 @@ CMD(add, N_("workspace"), N_("[PATH]..." throw usage(name); N(!app.opts.unknown || !app.opts.recursive, F("cannot set '--unknown' and '--recursive' at the same time")); - N(!app.opts.unknown || !app.opts.no_ignore, - F("cannot set '--unknown' and '--no-respect-ignore' at the same time")); app.require_workspace(); path_set paths; + bool add_recursive = app.opts.recursive; if (app.opts.unknown) { vector roots = args_to_paths(args); @@ -332,11 +331,12 @@ CMD(add, N_("workspace"), N_("[PATH]..." roots.push_back(file_path()); app.work.find_unknown_and_ignored(mask, roots, paths, ignored); + + app.work.perform_additions(ignored, add_recursive, !app.opts.no_ignore); } else split_paths(args_to_paths(args), paths); - bool add_recursive = app.opts.recursive; app.work.perform_additions(paths, add_recursive, !app.opts.no_ignore); }