cmdline: use --hidden and --hardlinked also on -T minimaldirs & co.

sahib · Dec 18, 2014 · fcf1f44 · fcf1f44
1 parent c9a9f68
commit fcf1f44
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/docs/faq.rst b/docs/faq.rst
@@ -1,8 +1,8 @@
 Frequently Asked Questions
 ==========================
 
-``rmlint`` finds more/less dupes than tool x!
----------------------------------------------
+``rmlint`` finds more/less dupes than tool **X**!
+-------------------------------------------------
 
 Make sure that *none* of the following applies to you:
 
@@ -13,10 +13,11 @@ by default. Suspicious options you should look into are:
 * ``--hidden``: Disabled by default, since it might screw up ``.git/`` and similar directories.
 * ``--hardlinked``: Might find larger amount files, but not more lint itself.
 * ``--followlinks``: Might lead ``rmlint`` to different places on the filesystem.
-* ``--merged-directories``: pulls in both ``--hidden`` and ``--hardlinked``.
+* ``--merge-directories``: pulls in both ``--hidden`` and ``--hardlinked``.
 
 If there's still a difference, check with another algorithm. In particular use
-``-ppp`` to enable paranoid mode. Also make sure to have ``-D / --merge-directories`` disabled to see the raw number of duplicate files.
+``-ppp`` to enable paranoid mode. Also make sure to have ``-D``
+(``--merge-directories``) disabled to see the raw number of duplicate files.
 
 Still here? Maybe talk to us on the `issue tracker`_.
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -41,7 +41,7 @@ to remove it. It is able to find:
 .. hlist::
    :columns: 2
 
-   + Duplicate files.
+   + Duplicate files & directories.
    + Nonstripped Binaries 
    + Broken symlinks.
    + Empty files.

diff --git a/src/cmdline.c b/src/cmdline.c
@@ -536,6 +536,11 @@ static void rm_cmd_parse_lint_types(RmSettings *settings, const char *lint_strin
         }
     }
 
+    if(settings->merge_directories) {
+        settings->ignore_hidden = false;
+        settings->find_hardlinked_dupes = true;
+    }
+
     /* clean up */
     g_strfreev(lint_types);
 }