diff options
| author | Ogulcan Celik <ogulcancelik@gmail.com> | 2026-07-28 15:34:13 +0300 |
|---|---|---|
| committer | Ogulcan Celik <ogulcancelik@gmail.com> | 2026-07-28 15:34:13 +0300 |
| commit | e16d7d8c07a20f5ee0b4111808680bbcfd7df9ac (patch) | |
| tree | 2c5c338c6096deaad1487b4b77e71d671e30b842 /src/app | |
| parent | 81f355fadac7d0d45b077dfc28f9f679add6bbb6 (diff) | |
fix: preserve linked worktree workspace labels
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/actions.rs | 2 | ||||
| -rw-r--r-- | src/app/api/worktrees.rs | 6 | ||||
| -rw-r--r-- | src/app/worktrees.rs | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/app/actions.rs b/src/app/actions.rs index 91572765..c92a91e5 100644 --- a/src/app/actions.rs +++ b/src/app/actions.rs @@ -4136,7 +4136,7 @@ mod tests { space: Some(crate::workspace::GitSpaceMetadata { key: "other-repo-key".into(), checkout_key: "/other/checkout".into(), - label: "other".into(), + repo_name: "other".into(), repo_root: "/other/repo".into(), is_linked_worktree: false, }), diff --git a/src/app/api/worktrees.rs b/src/app/api/worktrees.rs index 91a19673..7aa8c00f 100644 --- a/src/app/api/worktrees.rs +++ b/src/app/api/worktrees.rs @@ -212,7 +212,7 @@ impl App { source_checkout_path: space.repo_root.clone(), source_repo_root: space.repo_root, repo_key: space.key, - repo_name: space.label, + repo_name: space.repo_name, }; return Ok(source); } @@ -324,7 +324,7 @@ impl App { source_checkout_path: space.repo_root.clone(), source_repo_root: space.repo_root, repo_key: space.key, - repo_name: space.label, + repo_name: space.repo_name, }) } @@ -678,7 +678,7 @@ fn worktree_source_from_space( source_checkout_path: source_checkout_path.clone(), source_repo_root: source_checkout_path, repo_key: space.key, - repo_name: space.label, + repo_name: space.repo_name, } } diff --git a/src/app/worktrees.rs b/src/app/worktrees.rs index ca537bb8..c839c04a 100644 --- a/src/app/worktrees.rs +++ b/src/app/worktrees.rs @@ -57,7 +57,7 @@ impl App { Some(crate::workspace::GitSpaceMetadata { key: membership.key.clone(), checkout_key: membership.checkout_path.display().to_string(), - label: membership.label.clone(), + repo_name: membership.label.clone(), repo_root: membership.repo_root.clone(), is_linked_worktree: membership.is_linked_worktree, }) @@ -88,7 +88,7 @@ impl App { } }; - let repo_name = space.label.clone(); + let repo_name = space.repo_name.clone(); let seed = SystemTime::now() .duration_since(UNIX_EPOCH) .map(|duration| duration.as_micros().min(u128::from(u64::MAX)) as u64) @@ -224,7 +224,7 @@ impl App { source_checkout_path, source_repo_root: space.repo_root, repo_key: space.key, - repo_name: space.label, + repo_name: space.repo_name, entries, selected: 0, query: String::new(), |