Skip to content

Commit 9060500

Browse files
committed
Fix the link provided in the GitButler workspace commit.
1 parent d86bb78 commit 9060500

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

apps/desktop/src/components/NotOnGitButlerBranch.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<p class="switchrepo__message text-13 text-body">
8585
Due to GitButler managing multiple virtual branches, you cannot switch back and forth
8686
between git branches and virtual branches easily.
87-
<Link href="https://docs.gitbutler.com/features/virtual-branches/integration-branch">
87+
<Link href="https://docs.gitbutler.com/features/branch-management/integration-branch">
8888
Learn more
8989
</Link>
9090
</p>

apps/desktop/src/components/ProjectSetupTarget.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
automatically manages a special branch <span class="text-bold">gitbutler/workspace</span>.
155155
You can always switch back and forth as needed between normal git branches and the
156156
Gitbutler workspace.
157-
<Link href="https://docs.gitbutler.com/features/virtual-branches/integration-branch"
157+
<Link href="https://docs.gitbutler.com/features/branch-management/integration-branch"
158158
>Learn more</Link
159159
>
160160
</p>

crates/but-workspace/src/commit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ impl<'repo> WorkspaceCommit<'repo> {
279279
}
280280
message.push_str("For more information about what we're doing here, check out our docs:\n");
281281
message
282-
.push_str("https://docs.gitbutler.com/features/virtual-branches/integration-branch\n");
282+
.push_str("https://docs.gitbutler.com/features/branch-management/integration-branch\n");
283283

284284
let author = commit_signature(commit_time("GIT_COMMITTER_DATE"));
285285
gix::objs::Commit {

crates/but-workspace/tests/workspace/branch/apply_unapply_commit_uncommit.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ fn no_ws_ref_no_ws_commit_two_stacks_on_same_commit_ad_hoc_workspace_without_tar
220220
)?;
221221
// A workspace commit was created, even though it does nothing.
222222
insta::assert_snapshot!(visualize_commit_graph_all(&repo)?, @r"
223-
* 0cde2a9 (HEAD -> gitbutler/workspace) GitButler Workspace Commit
223+
* c18fa47 (HEAD -> gitbutler/workspace) GitButler Workspace Commit
224224
* e5d0542 (origin/main, main, B, A) A
225225
");
226226

@@ -245,7 +245,7 @@ fn no_ws_ref_no_ws_commit_two_stacks_on_same_commit_ad_hoc_workspace_without_tar
245245

246246
// It's idempotent, but has to update the workspace commit nonetheless for the comment, which depends on the stacks.
247247
insta::assert_snapshot!(visualize_commit_graph_all(&repo)?, @r"
248-
* 586a62e (HEAD -> gitbutler/workspace) GitButler Workspace Commit
248+
* df26e1f (HEAD -> gitbutler/workspace) GitButler Workspace Commit
249249
|\
250250
* e5d0542 (origin/main, main, B, A) A
251251
");
@@ -453,7 +453,7 @@ fn detached_head_journey() -> anyhow::Result<()> {
453453
");
454454
insta::assert_snapshot!(visualize_commit_graph_all(&repo)?, @r"
455455
* 49d4b34 (A) A1
456-
| * 9af353b (HEAD -> gitbutler/workspace) GitButler Workspace Commit
456+
| * 08fe1a8 (HEAD -> gitbutler/workspace) GitButler Workspace Commit
457457
| |\
458458
| | * f57c528 (B) B1
459459
| |/
@@ -509,7 +509,7 @@ fn detached_head_journey() -> anyhow::Result<()> {
509509
");
510510

511511
insta::assert_snapshot!(visualize_commit_graph_all(&repo)?, @r"
512-
*-. 4912314 (HEAD -> gitbutler/workspace) GitButler Workspace Commit
512+
*-. f2f2560 (HEAD -> gitbutler/workspace) GitButler Workspace Commit
513513
|\ \
514514
| | * f57c528 (B) B1
515515
| * | aaa195b (C) C1

crates/but-workspace/tests/workspace/commit_engine/refs_update.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ fn new_stack_receives_commit_and_adds_it_to_workspace_commit() -> anyhow::Result
305305
write_vrbranches_to_refs(&vb, &repo)?;
306306
// head was updated to point to the new workspace commit.
307307
insta::assert_snapshot!(visualize_commit_graph(&repo, repo.head_id()?)?, @r"
308-
* 3a78d15 (HEAD -> main) GitButler Workspace Commit
308+
* ed11351 (HEAD -> main) GitButler Workspace Commit
309309
|\
310310
| * 2ed9fca (s2/top) new file with 15 lines
311311
* | b451685 (s1/top, feat1) insert 5 lines to the top

crates/gitbutler-branch-actions/src/integration.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ pub fn update_workspace_commit(
131131
message.push_str("\n\n");
132132
}
133133
message.push_str("For more information about what we're doing here, check out our docs:\n");
134-
message.push_str("https://docs.gitbutler.com/features/virtual-branches/integration-branch\n");
134+
message.push_str("https://docs.gitbutler.com/features/branch-management/integration-branch\n");
135135

136136
let committer = gitbutler_repo::signature(SignaturePurpose::Committer)?;
137137
let author = gitbutler_repo::signature(SignaturePurpose::Author)?;

0 commit comments

Comments
 (0)