git restore --staged to unstage - Practice Problems & Coding Challenges

Challenge - 5 Problems

💻 Command Output

intermediate

What is the output of unstaging a file with git restore --staged?

You have staged a file named example.txt. You run git restore --staged example.txt. What happens to the file's state?

A The file is committed automatically.

B The file is deleted from the working directory and staging area.

C The file is staged again with no changes.

D The file is removed from the staging area but changes remain in the working directory.

💡 Hint

Think about what 'unstaging' means in Git.

Using git restore --staged removes the file from the staging area (index) but keeps your changes in the working directory. It does not delete or commit the file.

🧠 Conceptual

intermediate

Which command correctly unstages a file in Git?

You accidentally staged a file named config.yaml. Which command will unstage it without losing your changes?

A git restore --staged config.yaml

B git rm --cached config.yaml

C git commit --amend config.yaml

D git reset --hard config.yaml

💡 Hint

Unstaging means removing from the index but keeping the file.

git restore --staged removes the file from staging but keeps changes. git reset --hard discards changes. git commit --amend changes commits. git rm --cached removes the file from staging but keeps it in the working directory.

❓ Troubleshoot

advanced

Why does git restore --staged not remove changes from the working directory?

You ran git restore --staged README.md but your changes in the file are still visible. Why?

A Because <code>git restore --staged</code> only removes the file from the staging area, not the working directory.

B Because the file is locked by another process.

C Because the command requires the <code>--worktree</code> option to remove changes.

D Because the file was never staged to begin with.

💡 Hint

Think about the difference between staging area and working directory.

git restore --staged unstages the file but does not touch your actual file changes in the working directory. To discard changes, a different command is needed.

🔀 Workflow

advanced

What is the correct sequence to unstage a file and then discard its changes?

You staged and modified app.js. You want to unstage it and also remove all changes, restoring it to the last commit. Which sequence is correct?

A git reset HEAD app.js; git rm app.js

B git restore app.js; git restore --staged app.js

C git restore --staged app.js; git restore app.js

D git commit --amend; git restore app.js

💡 Hint

First remove from staging, then discard changes.

First, git restore --staged app.js unstages the file. Then, git restore app.js discards changes in the working directory, restoring the last committed version.

✅ Best Practice

expert

Which command safely unstages all files without discarding any changes?

You have multiple files staged but want to unstage all of them at once without losing any work. Which command should you use?

A git reset --hard

B git restore --staged .

C git clean -fd

D git rm --cached -r .

💡 Hint

Unstage all files but keep changes intact.

git restore --staged . unstages all files in the current directory and below, keeping your changes. git reset --hard discards all changes. git clean -fd removes untracked files. git rm --cached -r . removes files from staging but keeps them in the working directory.

Practice

1. What does the command git restore --staged <file> do in Git?

easy

A. It commits the file to the repository.

B. It deletes the file from the working directory and staging area.

C. It removes the file from the staging area but keeps the changes in the working directory.

D. It discards all changes in the file and restores it to the last commit.

Solution

1. Step 1: Understand the staging area role

   The staging area holds files ready to be committed, but changes still exist in the working directory.

2. Step 2: Effect of git restore --staged

   This command removes the file from staging but keeps your edits in the working directory, so you can fix or adjust before committing.

3. Final Answer:

   It removes the file from the staging area but keeps the changes in the working directory. -> Option C

4. Quick Check:

   Unstage = remove from staging, keep edits [OK]

Hint: Unstage means remove from staging, keep your edits [OK]

Common Mistakes:

• Thinking it deletes the file from disk
• Confusing it with discarding changes
• Assuming it commits the file immediately

2. Which of the following is the correct syntax to unstage a file named app.js using git restore?

easy

A. git restore --staged app.js

B. git restore app.js --staged

C. git restore --unstage app.js

D. git restore --remove app.js

Solution

1. Step 1: Recall correct option order for flags

   In Git commands, flags usually come before the file names.

2. Step 2: Apply to git restore --staged

   The correct syntax places --staged before the file name: git restore --staged app.js.

3. Final Answer:

   git restore --staged app.js -> Option A

4. Quick Check:

   Flags before files = correct syntax [OK]

Hint: Put flags before filenames in git commands [OK]

Common Mistakes:

• Placing --staged after the filename
• Using non-existent flags like --unstage
• Confusing restore with reset commands

3. Given the following sequence of commands:

echo 'initial' > file.txt
 git add file.txt
 git commit -m 'initial'
 echo 'Hello' > file.txt
 git add file.txt
 git restore --staged file.txt
 git status

What will git status show about file.txt?

medium

A. file.txt is staged for commit.

B. file.txt is deleted.

C. file.txt is unmodified and not staged.

D. file.txt is modified but not staged.

Solution

1. Step 1: Analyze the commands step-by-step

   First, 'Hello' is written to file.txt. Then, git add stages it. Next, git restore --staged file.txt removes it from staging but keeps the change.

2. Step 2: Understand the status after unstaging

   Since the file is modified but unstaged, git status will show it as modified but not staged for commit.

3. Final Answer:

   file.txt is modified but not staged. -> Option D

4. Quick Check:

   Unstaged changes = modified but not staged [OK]

Hint: Unstaged files show as modified but not staged [OK]

Common Mistakes:

• Assuming file is still staged after restore --staged
• Thinking file is unmodified after unstaging
• Confusing unstaged with deleted

4. You ran git restore --staged myfile.txt but got an error: error: pathspec 'myfile.txt' did not match any files. What is the most likely cause?

medium

A. The file myfile.txt is not currently staged.

B. You misspelled the command; it should be git reset --staged.

C. The file does not exist in the working directory.

D. You need to add --force to the command.

Solution

1. Step 1: Understand the error message meaning

   The error says the file path does not match any staged files, meaning Git can't find it in the staging area.

2. Step 2: Check the file's staging status

   If the file is not staged, git restore --staged cannot unstage it, causing this error.

3. Final Answer:

   The file myfile.txt is not currently staged. -> Option A

4. Quick Check:

   Unstage error means file not staged [OK]

Hint: File must be staged to unstage it [OK]

Common Mistakes:

• Assuming command syntax is wrong
• Thinking file must exist only in working directory
• Trying to force unstage without staging first

5. You staged two files, index.html and style.css, but realize you only want to commit index.html. Which command correctly unstages style.css without losing your edits?

hard

A. git checkout -- style.css

B. git restore --staged style.css

C. git reset --hard style.css

D. git rm --cached style.css

Solution

1. Step 1: Identify the goal

   You want to unstage style.css but keep your changes in the working directory.

2. Step 2: Compare commands

   git restore --staged style.css unstages the file but keeps edits.
   git reset --hard style.css is invalid syntax with paths and cannot unstage a specific file.
   git checkout -- style.css updates working tree from index but does not unstage.
   git rm --cached style.css stages a deletion, which is not desired.

3. Final Answer:

   git restore --staged style.css -> Option B

4. Quick Check:

   Use restore --staged to unstage safely [OK]

Hint: Use git restore --staged to unstage without losing edits [OK]

Common Mistakes:

• Using git checkout which discards changes
• Using git rm --cached which removes file tracking
• Confusing git reset with discard commands