feat: add gix merge commit --debug

This yields additional debugging information with details about detected conflicts.

Author: Byron

gitoxide-core/src/repository/merge/commit.rs

@@ -18,6 +18,7 @@ pub fn commit(
         format,
         file_favor,
         in_memory,
+        debug,
     }: Options,
 ) -> anyhow::Result<()> {
     if format != OutputFormat::Human {
@@ -63,6 +64,9 @@ pub fn commit(
         writeln!(out, "{tree_id} (wrote {written} trees)")?;
     }
 
+    if debug {
+        writeln!(err, "{:#?}", &res.conflicts)?;
+    }
     if !has_conflicts {
         writeln!(err, "{} possibly resolved conflicts", res.conflicts.len())?;
     }

gitoxide-core/src/repository/merge/tree.rs

@@ -4,6 +4,7 @@ pub struct Options {
     pub format: OutputFormat,
     pub file_favor: Option<gix::merge::tree::FileFavor>,
     pub in_memory: bool,
+    pub debug: bool,
 }
 
 pub(super) mod function {
@@ -29,6 +30,7 @@ pub(super) mod function {
             format,
             file_favor,
             in_memory,
+            debug,
         }: Options,
     ) -> anyhow::Result<()> {
         if format != OutputFormat::Human {
@@ -77,6 +79,9 @@ pub(super) mod function {
             writeln!(out, "{tree_id} (wrote {written} trees)")?;
         }
 
+        if debug {
+            writeln!(err, "{:#?}", &res.conflicts)?;
+        }
         if !has_conflicts {
             writeln!(err, "{} possibly resolved conflicts", res.conflicts.len())?;
         }

src/plumbing/main.rs

@@ -174,6 +174,7 @@ pub fn main() -> Result<()> {
             merge::SubCommands::Tree {
                 in_memory,
                 file_favor,
+                debug,
                 ours,
                 base,
                 theirs,
@@ -196,13 +197,15 @@ pub fn main() -> Result<()> {
                             format,
                             file_favor: file_favor.map(Into::into),
                             in_memory,
+                            debug,
                         },
                     )
                 },
             ),
             merge::SubCommands::Commit {
                 in_memory,
                 file_favor,
+                debug,
                 ours,
                 theirs,
             } => prepare_and_run(
@@ -223,6 +226,7 @@ pub fn main() -> Result<()> {
                             format,
                             file_favor: file_favor.map(Into::into),
                             in_memory,
+                            debug,
                         },
                     )
                 },

src/plumbing/options/mod.rs

@@ -420,6 +420,9 @@ pub mod merge {
             /// Decide how to resolve content conflicts in files. If unset, write conflict markers and fail.
             #[clap(long, short = 'f')]
             file_favor: Option<FileFavor>,
+            /// Print additional information about conflicts for debugging.
+            #[clap(long, short = 'd')]
+            debug: bool,
 
             /// A revspec to our treeish.
             #[clap(value_name = "OURS", value_parser = crate::shared::AsBString)]
@@ -441,6 +444,9 @@ pub mod merge {
             /// Decide how to resolve content conflicts in files. If unset, write conflict markers and fail.
             #[clap(long, short = 'f')]
             file_favor: Option<FileFavor>,
+            /// Print additional information about conflicts for debugging.
+            #[clap(long, short = 'd')]
+            debug: bool,
 
             /// A revspec to our committish.
             #[clap(value_name = "OURS", value_parser = crate::shared::AsBString)]