Creating a worktree in Git - Quick Revision & Summary

Recall & Review

beginner

What is a Git worktree?

A Git worktree is an additional working directory linked to the same Git repository. It allows you to work on multiple branches simultaneously without switching branches in a single directory.

beginner

How do you create a new worktree for a branch named feature?

Use the command git worktree add <path> feature. This creates a new directory at <path> with the feature branch checked out.

intermediate

Why use Git worktrees instead of cloning the repository multiple times?

Worktrees share the same Git repository data, saving disk space and keeping history consistent. Cloning multiple times duplicates data and uses more space.

beginner

What command lists all existing Git worktrees?

Run git worktree list to see all worktrees linked to the repository, including their paths and checked-out branches.

intermediate

How do you remove a Git worktree safely?

First, delete the worktree directory manually. Then run git worktree prune to clean up references to removed worktrees.

What does the command git worktree add ./new-feature feature do?

A Creates a new directory ./new-feature with the branch 'feature' checked out

B Deletes the branch 'feature'

C Switches the current directory to branch 'feature'

D Clones the repository into ./new-feature

The command adds a new worktree at ./new-feature with the 'feature' branch checked out.

Which command shows all worktrees linked to your Git repository?

A git status

B git branch -a

C git remote -v

D git worktree list

git worktree list displays all worktrees connected to the repository.

Why might you prefer a Git worktree over cloning the repo multiple times?

A Worktrees save disk space by sharing repository data

B Worktrees create separate repositories

C Cloning is faster than worktrees

D Worktrees do not support multiple branches

Worktrees share the same Git data, saving disk space compared to multiple clones.

What must you do after deleting a worktree directory manually?

A Run <code>git branch -d</code>

B Run <code>git clone</code>

C Run <code>git worktree prune</code> to clean references

D Nothing, Git cleans automatically

After manual deletion, git worktree prune removes stale references.

Can you have multiple worktrees checked out on different branches at the same time?

A No, only one worktree can be active

B Yes, that is the main benefit of worktrees

C Yes, but only if branches are merged

D No, worktrees share the same branch

Worktrees let you work on multiple branches simultaneously in separate directories.

Explain what a Git worktree is and why it is useful.

Think about working on two projects at once without switching folders.

Describe the steps to create and then remove a Git worktree safely.

Consider how to add a new folder for a branch and clean up after.

Practice

1. What is the main purpose of creating a Git worktree?

easy

A. To work on multiple branches simultaneously in separate folders

B. To merge two branches automatically

C. To delete a branch safely

D. To compress the repository size

Solution

1. Step 1: Understand what a worktree is

   A Git worktree allows you to have multiple working directories linked to the same repository.

2. Step 2: Identify the main use case

   This lets you work on different branches at the same time without switching branches in one folder.

3. Final Answer:

   To work on multiple branches simultaneously in separate folders -> Option A

4. Quick Check:

   Worktree = multiple branches, multiple folders [OK]

Hint: Worktrees = multiple branches open in separate folders [OK]

Common Mistakes:

• Thinking worktree merges branches
• Confusing worktree with branch deletion
• Believing worktree compresses repo

2. Which of the following is the correct syntax to create a new worktree for branch feature in folder ../feature-folder?

easy

A. git worktree add ../feature-folder feature

B. git worktree create feature ../feature-folder

C. git add worktree feature ../feature-folder

D. git worktree new ../feature-folder feature

Solution

1. Step 1: Recall the correct command structure

   The command to add a worktree is git worktree add <path> <branch>.

2. Step 2: Match the syntax with options

   git worktree add ../feature-folder feature matches the correct syntax exactly.

3. Final Answer:

   git worktree add ../feature-folder feature -> Option A

4. Quick Check:

   git worktree add path branch = correct syntax [OK]

Hint: Remember: 'git worktree add path branch' is correct syntax [OK]

Common Mistakes:

• Using 'create' instead of 'add'
• Swapping branch and path order
• Using 'git add worktree' which is invalid

3. Given the commands:

git worktree add ../test-branch test
cd ../test-branch
git branch --show-current

What will be the output of the last command?

medium

A. master

B. main

C. test

D. detached HEAD

Solution

1. Step 1: Understand what 'git worktree add' does

   This command creates a new folder with the specified branch checked out.

2. Step 2: Check current branch in new worktree

   After changing directory, git branch --show-current shows the branch name checked out, which is 'test'.

3. Final Answer:

   test -> Option C

4. Quick Check:

   Worktree folder shows branch name = test [OK]

Hint: Worktree folder shows the branch you added [OK]

Common Mistakes:

• Assuming default branch 'main' or 'master'
• Thinking it shows detached HEAD
• Confusing branch names

4. You run git worktree add ../new-feature without specifying a branch. What will happen?

medium

A. Git creates a new worktree with the current branch checked out

B. Git creates a new branch automatically

C. Git throws an error asking for a branch name

D. Git creates a detached HEAD worktree at the current commit

Solution

1. Step 1: Check behavior when branch is omitted

   If no branch is specified, Git creates a worktree at the current commit in detached HEAD state.

2. Step 2: Understand the result

   This means the worktree is not on any branch but on a specific commit.

3. Final Answer:

   Git creates a detached HEAD worktree at the current commit -> Option D

4. Quick Check:

   No branch given = detached HEAD worktree [OK]

Hint: No branch? Worktree is detached HEAD at current commit [OK]

Common Mistakes:

• Expecting an error without branch
• Thinking it uses current branch name
• Assuming a new branch is created

5. You want to work on two branches, main and feature, simultaneously. Your repo has no feature branch yet. Which sequence correctly creates a worktree for feature and switches to it?

hard

A. git worktree add ../feature feature
cd ../feature

B. git branch feature
git worktree add ../feature feature
cd ../feature

C. git worktree add ../feature feature
cd ../feature
git checkout -b feature

D. git checkout -b feature
git worktree add ../feature feature
cd ../feature

Solution

1. Step 1: Create the branch before adding worktree

   You must create the branch 'feature' first because it does not exist yet.

2. Step 2: Add the worktree for the new branch and switch directory

   Then add the worktree pointing to 'feature' and change to that folder.

3. Final Answer:

   git branch feature git worktree add ../feature feature cd ../feature -> Option B

4. Quick Check:

   Create branch first, then add worktree [OK]

Hint: Create branch first, then add worktree for it [OK]

Common Mistakes:

• Adding worktree before branch exists
• Creating branch inside worktree folder
• Forgetting to switch directory