feat: Add option to always include cwd prefix

Fixes: #1243
Fixes: #1331

contrib/completion/_fd

@@ -162,7 +162,8 @@ _fd() {
     $no'(*)*--search-path=[set search path (instead of positional <path> arguments)]:directory:_files -/'
 
     + strip-cwd-prefix
-    $no'(strip-cwd-prefix exec-cmds)--strip-cwd-prefix[Strip ./ prefix when output is redirected]'
+    $no'(strip-cwd-prefix exec-cmds)--strip-cwd-prefix[Strip ./ prefix unconditionally]'
+    $no'(abs-path)--cwd-prefix[Include ./ prefix unconditionally]'
 
     + and
     '--and=[additional required search path]:pattern'

doc/fd.1

@@ -160,8 +160,15 @@ Enable the display of filesystem errors for situations such as insufficient
 permissions or dead symlinks.
 .TP
 .B \-\-strip-cwd-prefix
-By default, relative paths are prefixed with './' when the output goes to a non interactive terminal
-(TTY). Use this flag to disable this behaviour.
+By default, relative paths are prefixed with './' when -x/--exec,
+-X/--exec-batch, or -0/--print0 are given, to reduce the risk of a
+path starting with '-' being treated as a command line option. Use
+this flag to disable this behaviour.
+.TP
+.B \-\-cwd\-prefix
+Force including the './' prefix for relative paths. By default, this
+is not included unless using --exec, --exec-batch, or --print0. But with
+this option, the prefix is never stripped.
 .TP
 .B \-\-one\-file\-system, \-\-mount, \-\-xdev
 By default, fd will traverse the file system tree as far as other options dictate. With this flag, fd ensures that it does not descend into a different file system than the one it started in. Comparable to the -mount or -xdev filters of find(1).

src/cli.rs

@@ -622,6 +622,18 @@ pub struct Opts {
     #[arg(long, conflicts_with_all(&["path", "search_path"]), hide_short_help = true, long_help)]
     pub strip_cwd_prefix: bool,
 
+    /// Force including the './' prefix for relative paths. By default, this
+    /// is not included unless using --exec, --exec-batch, or --print0. But with
+    /// this option, the prefix is never stripped.
+    #[arg(
+        long,
+        hide_short_help = true,
+        conflicts_with("absolute_path"),
+        overrides_with("strip_cwd_prefix"),
+        long_help
+    )]
+    pub cwd_prefix: bool,
+
     /// By default, fd will traverse the file system tree as far as other options
     /// dictate. With this flag, fd ensures that it does not descend into a
     /// different file system than the one it started in. Comparable to the -mount

src/main.rs

@@ -312,6 +312,7 @@ fn construct_config(mut opts: Opts, pattern_regexps: &[String]) -> Result<Config
         actual_path_separator,
         max_results: opts.max_results(),
         strip_cwd_prefix: (opts.no_search_paths()
+            && !opts.cwd_prefix
             && (opts.strip_cwd_prefix || !(opts.null_separator || has_command))),
     })
 }