Submodules vs subtrees comparison in Git - Practice Questions

Challenge - 5 Problems

🧠 Conceptual

intermediate

Difference in repository structure between submodules and subtrees

Which statement correctly describes how Git submodules and subtrees manage external repositories within a main project?

A Submodules keep external repositories as separate folders linked by a commit pointer, while subtrees merge external repositories into the main repository's history.

B Submodules merge external repositories into the main repository's history, while subtrees keep them as separate folders linked by a commit pointer.

C Both submodules and subtrees merge external repositories into the main repository's history without keeping separate folders.

D Both submodules and subtrees keep external repositories as separate folders without merging histories.

💡 Hint

Think about whether the external code is stored inside the main repo's history or referenced separately.

Git submodules add external repositories as separate folders with a specific commit pointer, keeping their histories separate. Subtrees merge the external repository's history into the main repository, making it part of the main repo's commit history.

💻 Command Output

intermediate

Output of cloning a repository with submodules

What is the output of running the following commands in a fresh directory?

git clone https://example.com/project.git
git submodule update --init --recursive

A Clones the main project and submodules but does not initialize them.

B Clones only the main project without downloading submodule content.

C Clones the main project and initializes all submodules recursively, downloading their content.

D Fails with an error because submodules cannot be cloned recursively.

💡 Hint

Consider what the --init and --recursive flags do for submodules.

The command git clone clones the main repository. The git submodule update --init --recursive command initializes and fetches all submodules recursively, ensuring their content is downloaded.

🔀 Workflow

advanced

Updating a subtree to the latest commit from the external repository

Which sequence of commands correctly updates a Git subtree named 'libs/tool' to the latest commit from its remote repository 'https://example.com/tool.git' on branch 'main'?

A git subtree push --prefix=libs/tool https://example.com/tool.git main

B git fetch https://example.com/tool.git && git merge FETCH_HEAD

C git submodule update --remote libs/tool

D git subtree pull --prefix=libs/tool https://example.com/tool.git main

💡 Hint

Think about which command pulls and merges changes into the subtree directory.

The git subtree pull command fetches and merges changes from the external repository into the specified subtree directory. The --prefix option specifies the subtree folder.

❓ Troubleshoot

advanced

Troubleshooting detached HEAD state in submodules

After cloning a repository with submodules and running git submodule update --init, you notice the submodule is in a detached HEAD state. What is the best explanation?

A The submodule repository is corrupted and cannot checkout branches.

B Submodules are checked out at a specific commit, not a branch, causing detached HEAD.

C The main repository forgot to include the submodule's branch information.

D Detached HEAD means the submodule is not initialized properly.

💡 Hint

Consider how submodules track commits versus branches.

Git submodules track a specific commit, not a branch. When updated, they checkout that commit directly, resulting in a detached HEAD state. This is normal behavior.

✅ Best Practice

expert

Choosing between submodules and subtrees for a shared library

You maintain a shared library used by multiple projects. You want to keep the library's history separate, allow independent updates, and avoid complex merge conflicts in the main projects. Which approach is best?

A Use Git submodules to keep the library separate and allow independent updates.

B Use Git subtrees to merge the library history into each project for simpler management.

C Copy the library files manually into each project to avoid Git complexity.

D Use Git subtrees but avoid pushing updates back to the library repository.

💡 Hint

Think about separation of history and ease of independent updates.

Git submodules keep the shared library as a separate repository with its own history, allowing independent updates and avoiding merge conflicts in the main projects. Subtrees merge histories, which can complicate updates.