Merge pull request #7902 from gitbutlerapp/fix-commiting-with-one-stack

Fix commting with one stack

Author: Byron

Cargo.lock

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.dependencies]
 bstr = "1.11.1"
 # Add the `tracing` or `tracing-detail` features to see more of gitoxide in the logs. Useful to see which programs it invokes.
-gix = { git = "https://github.com/GitoxideLabs/gitoxide", rev = "7255a5fc0aa790b54e3176e8ecf066457acd9eef", default-features = false, features = [
+gix = { git = "https://github.com/GitoxideLabs/gitoxide", rev = "cd96b6439d119c5189a8e7349d2e7e2533db41b5", default-features = false, features = [
 ] }
 gix-testtools = "0.15.0"
 insta = "1.41.1"

Cargo.toml

@@ -78,7 +78,7 @@ fn intersect_workspace_ranges(
     let mut missed_hunks = Vec::new();
     for change in worktree_changes {
         let unidiff = change.unified_diff(repo, 0)?;
-        let but_core::UnifiedDiff::Patch { hunks } = unidiff else {
+        let but_core::UnifiedDiff::Patch { hunks, .. } = unidiff else {
             continue;
         };
         let mut intersections = Vec::new();

crates/but-cli/src/command/diff.rs

@@ -175,7 +175,7 @@ pub(crate) fn discard_change(
                     change.path == path
                         && change.previous_path() == previous_path.as_ref().map(|p| p.as_bstr())
                 }).with_context(|| format!("Couldn't find worktree change for file at '{path}' (previous-path: {previous_path:?}"))?;
-            let UnifiedDiff::Patch { hunks } =
+            let UnifiedDiff::Patch { hunks, .. } =
                 worktree_changes.unified_diff(&repo, UI_CONTEXT_LINES)?
             else {
                 bail!("No hunks available for given '{path}'")

crates/but-cli/src/command/mod.rs

@@ -137,9 +137,13 @@ pub enum UnifiedDiff {
         size_in_bytes: u64,
     },
     /// A patch that if applied to the previous state of the resource would yield the current state.
+    #[serde(rename_all = "camelCase")]
     Patch {
         /// All non-overlapping hunks, including their context lines.
         hunks: Vec<unified_diff::DiffHunk>,
+        /// If `true`, a binary to text filter (`textconv` in Git config) was used to obtain the `hunks` in the diff.
+        /// This means hunk-based operations must be disabled.
+        is_result_of_binary_to_text_conversion: bool,
     },
 }
 

crates/but-core/src/lib.rs

@@ -164,6 +164,7 @@ impl UnifiedDiff {
                 }
                 let input = prep.interned_input();
                 UnifiedDiff::Patch {
+                    is_result_of_binary_to_text_conversion: prep.old_or_new_is_derived,
                     hunks: gix::diff::blob::diff(
                         algorithm,
                         &input,
@@ -185,7 +186,7 @@ impl UnifiedDiff {
                 use gix::diff::blob::platform::resource::Data;
                 fn size_for_data(data: Data<'_>) -> Option<u64> {
                     match data {
-                        Data::Missing | Data::Buffer(_) => None,
+                        Data::Missing | Data::Buffer { .. } => None,
                         Data::Binary { size } => Some(size),
                     }
                 }

crates/but-core/src/unified_diff.rs

@@ -590,13 +590,15 @@ fn worktree_changes_unified_diffs_json_example() -> anyhow::Result<()> {
               "newLines": 1,
               "diff": "@@ -1,0 +1,1 @@\n+content\n"
             }
-          ]
+          ],
+          "isResultOfBinaryToTextConversion": false
         }
       },
       {
         "type": "Patch",
         "subject": {
-          "hunks": []
+          "hunks": [],
+          "isResultOfBinaryToTextConversion": false
         }
       },
       {
@@ -610,7 +612,8 @@ fn worktree_changes_unified_diffs_json_example() -> anyhow::Result<()> {
               "newLines": 1,
               "diff": "@@ -1,0 +1,1 @@\n+link-target\n"
             }
-          ]
+          ],
+          "isResultOfBinaryToTextConversion": false
         }
       },
       {
@@ -624,7 +627,8 @@ fn worktree_changes_unified_diffs_json_example() -> anyhow::Result<()> {
               "newLines": 1,
               "diff": "@@ -1,0 +1,1 @@\n+content not to add to the index\n"
             }
-          ]
+          ],
+          "isResultOfBinaryToTextConversion": false
         }
       },
       {
@@ -638,7 +642,8 @@ fn worktree_changes_unified_diffs_json_example() -> anyhow::Result<()> {
               "newLines": 1,
               "diff": "@@ -1,0 +1,1 @@\n+change-in-index\n"
             }
-          ]
+          ],
+          "isResultOfBinaryToTextConversion": false
         }
       },
       {
@@ -652,13 +657,15 @@ fn worktree_changes_unified_diffs_json_example() -> anyhow::Result<()> {
               "newLines": 1,
               "diff": "@@ -1,0 +1,1 @@\n+change-in-worktree\n"
             }
-          ]
+          ],
+          "isResultOfBinaryToTextConversion": false
         }
       },
       {
         "type": "Patch",
         "subject": {
-          "hunks": []
+          "hunks": [],
+          "isResultOfBinaryToTextConversion": false
         }
       },
       {
@@ -672,19 +679,22 @@ fn worktree_changes_unified_diffs_json_example() -> anyhow::Result<()> {
               "newLines": 1,
               "diff": "@@ -1,0 +1,1 @@\n+worktree-change\n"
             }
-          ]
+          ],
+          "isResultOfBinaryToTextConversion": false
         }
       },
       {
         "type": "Patch",
         "subject": {
-          "hunks": []
+          "hunks": [],
+          "isResultOfBinaryToTextConversion": false
         }
       },
       {
         "type": "Patch",
         "subject": {
-          "hunks": []
+          "hunks": [],
+          "isResultOfBinaryToTextConversion": false
         }
       }
     ]