simplify status base line

crates/but/src/command/legacy/status/mod.rs

@@ -149,19 +149,13 @@ pub(crate) async fn worktree(
         let repo = ctx.repo.get()?;
         let base_commit = repo.find_commit(target.sha.to_gix())?;
         let base_commit_decoded = base_commit.decode()?;
-        let message = base_commit_decoded
-            .message
-            .to_string()
-            .replace('\n', " ")
-            .chars()
-            .take(50)
-            .collect::<String>();
+        let full_message = base_commit_decoded.message.to_string();
         let formatted_date = base_commit_decoded.committer()?.time()?.format_or_unix(DATE_ONLY);
         let author = base_commit_decoded.author()?;
         let common_merge_base_data = CommonMergeBase {
             target_name: target_name.clone(),
             common_merge_base: target.sha.to_string()[..7].to_string(),
-            message: message.clone(),
+            message: full_message,
             commit_date: formatted_date,
             commit_id: target.sha.to_gix(),
             created_at: base_commit_decoded.committer()?.time()?.seconds as i128 * 1000,
@@ -362,19 +356,23 @@ pub(crate) async fn worktree(
         }
     }
 
+    let display_message = common_merge_base_data
+        .message
+        .lines()
+        .next()
+        .unwrap_or("")
+        .chars()
+        .take(40)
+        .collect::<String>();
+
     writeln!(
         out,
-        "{} {} (common base) [{}] {} {}{}",
+        "{} {} [{}] {} {}",
         if upstream_state.is_some() { "├╯" } else { "┴" },
         common_merge_base_data.common_merge_base.dimmed(),
         common_merge_base_data.target_name.green().bold(),
         common_merge_base_data.commit_date.dimmed(),
-        common_merge_base_data.message,
-        if upstream_state.is_none() {
-            last_checked_text.dimmed().to_string()
-        } else {
-            String::new()
-        }
+        display_message,
     )?;
 
     let not_on_workspace = matches!(mode, gitbutler_operating_modes::OperatingMode::OutsideWorkspace(_));

crates/but/tests/but/command/absorb.rs

@@ -299,7 +299,7 @@ k0 a.txt│
 ┊│     d3:pl A B
 ├╯
 ┊
-┴ 0dc3733 (common base) [origin/main] 2000-01-02 add M 
+┴ 0dc3733 [origin/main] 2000-01-02 add M
 
 Hint: run `but diff` to see uncommitted changes and `but stage <file>` to stage them to a branch
 
@@ -351,7 +351,7 @@ Hint: you can run `but undo` to undo these changes
 ┊│     d3:pl A B
 ├╯
 ┊
-┴ 0dc3733 (common base) [origin/main] 2000-01-02 add M 
+┴ 0dc3733 [origin/main] 2000-01-02 add M
 
 Hint: run `but help` for all commands
 
@@ -464,7 +464,7 @@ Hint: you can run `but undo` to undo these changes
 ┊●   d3e2ba3 add B  
 ├╯
 ┊
-┴ 0dc3733 (common base) [origin/main] 2000-01-02 add M 
+┴ 0dc3733 [origin/main] 2000-01-02 add M
 
 Hint: run `but help` for all commands
 
@@ -581,7 +581,7 @@ Hint: you can run `but undo` to undo these changes
 ┊●   d3e2ba3 add B  
 ├╯
 ┊
-┴ 0dc3733 (common base) [origin/main] 2000-01-02 add M 
+┴ 0dc3733 [origin/main] 2000-01-02 add M
 
 Hint: run `but diff` to see uncommitted changes and `but stage <file>` to stage them to a branch
 

crates/but/tests/but/command/status.rs

@@ -178,7 +178,7 @@ fn json_shows_paths_as_strings() -> anyhow::Result<()> {
     "cliId": "",
     "commitId": "0dc37334a458df421bf67ea806103bf5004845dd",
     "createdAt": "2000-01-02T00:00:00+00:00",
-    "message": "add M ",
+    "message": "add M/n",
     "authorName": "author",
     "authorEmail": "author@example.com",
     "conflicted": null,
@@ -191,7 +191,7 @@ fn json_shows_paths_as_strings() -> anyhow::Result<()> {
       "cliId": "",
       "commitId": "0dc37334a458df421bf67ea806103bf5004845dd",
       "createdAt": "2000-01-02T00:00:00+00:00",
-      "message": "add M ",
+      "message": "add M/n",
       "authorName": "author",
       "authorEmail": "author@example.com",
       "conflicted": null,

crates/but/tests/but/journey.rs

@@ -142,7 +142,7 @@ Learn more at https://docs.gitbutler.com/cli-overview
 ╭┄zz [unstaged changes] 
 ┊     no changes
 ┊
-┴ 6f66116 (common base) [gb-local/main] 2000-01-02 Initial empty commit 
+┴ 6f66116 [gb-local/main] 2000-01-02 Initial empty commit
 
 Hint: run `but branch new` to create a new branch to work on