Recovering deleted branches in Git - Practice Problems & Coding Challenges

Challenge - 5 Problems

💻 Command Output

intermediate

Recovering a recently deleted branch

You accidentally deleted a branch named feature-x. Which command will correctly restore it if the branch was deleted very recently and you know the branch's last commit is still in the reflog?

A git checkout -b feature-x $(git reflog show feature-x -1 | awk '{print $1}')

B git checkout -b feature-x refs/reflog/feature-x

C git checkout -b feature-x $(git reflog | head -1 | awk '{print $1}')

D git checkout -b feature-x $(git reflog | grep feature-x | head -1 | awk '{print $1}')

💡 Hint

Use git reflog show feature-x to access the branch-specific reflog and extract the most recent commit hash.

The command git reflog show feature-x -1 displays the most recent entry in the reflog for the feature-x branch reference, even after deletion. The first field is the commit hash of the branch tip. awk '{print $1}' extracts it, and git checkout -b recreates the branch at that commit.

🧠 Conceptual

intermediate

Understanding reflog for branch recovery

What does the git reflog command track that makes it useful for recovering deleted branches?

A It records all changes to the tip of branches and HEAD, including commits and checkouts.

B It tracks all remote branches and their statuses.

C It lists all files changed in the repository history.

D It shows the current status of the working directory and staging area.

💡 Hint

Think about what information helps find lost commits or branches.

git reflog records every change to HEAD and branch tips, including commits, checkouts, resets, and merges. This history allows you to find commits even if branches are deleted.

❓ Troubleshoot

advanced

Recovering a deleted branch when reflog is cleared

You deleted a branch bugfix and also ran git reflog expire --expire=now --all which cleared the reflog. What is the most reliable way to recover the branch now?

A Run <code>git checkout -b bugfix origin/bugfix</code> to restore from remote tracking branch.

B Run <code>git branch bugfix</code> to recreate the branch with the same name.

C Use <code>git reset --hard HEAD@{1}</code> to undo the deletion.

D Use <code>git fsck --lost-found</code> to find dangling commits and create the branch from the correct commit hash.

💡 Hint

Think about how to find commits not referenced by any branch or reflog.

git fsck --lost-found finds dangling commits that are not referenced by any branch or reflog. You can identify the commit for the deleted branch and recreate it. Other options either rely on remote branches or do not restore the commit.

🔀 Workflow

advanced

Steps to recover a deleted branch safely

Which sequence of commands correctly recovers a deleted branch release using reflog and then pushes it back to the remote repository?

A 2,4,1,3

B 2,1,4,3

C 2,1,3,4

D 1,2,4,3

💡 Hint

First find the commit, then create the branch, verify, and finally push.

First, use git reflog to find the commit hash. Then create the branch at that commit with git checkout -b release <commit-hash>. Next, verify the branch history with git log --oneline -5. Finally, push the recovered branch to the remote with git push origin release.

✅ Best Practice

expert

Preventing branch loss in collaborative projects

What is the best practice to avoid losing important branches accidentally in a shared Git repository?

A Avoid using branches and work only on the main branch to reduce complexity.

B Always delete branches locally and never push them to remote.

C Regularly push branches to remote and protect important branches with branch protection rules.

D Use <code>git gc</code> frequently to clean up old branches automatically.

💡 Hint

Think about collaboration and safety features in Git hosting services.

Pushing branches to remote ensures they are backed up. Branch protection rules prevent accidental deletion or force pushes on important branches. This practice helps teams avoid losing work.