Clean vs dirty working directory in Git - Hands-On Comparison

Clean vs Dirty Working Directory in Git

📖 Scenario: You are working on a project using Git for version control. You want to understand how to check if your working directory is clean (no changes) or dirty (has changes) before committing your work.

🎯 Goal: Learn how to check the status of your Git working directory to see if it is clean or dirty using Git commands.

📋 What You'll Learn

Create a new Git repository

Create a file and add it to the repository

Modify the file to make the working directory dirty

Use Git commands to check the working directory status

💡 Why This Matters

🌍 Real World

Checking if your working directory is clean or dirty helps you avoid committing unwanted changes and keeps your project history clean.

💼 Career

Understanding Git status is essential for developers and DevOps engineers to manage code changes safely and collaborate effectively.

1

Initialize a Git repository and create a file

Run the command git init to create a new Git repository. Then create a file named example.txt with the content Hello Git.

Git

# Run 'git init' and create 'example.txt' with content 'Hello Git'
# Your code here

Hint

Use git init to start a repository. Use echo to create the file with text.

2

Add the file to Git and commit

Run the command git add example.txt to stage the file. Then run git commit -m "Initial commit" to commit the file to the repository.

Git

git init

echo "Hello Git" > example.txt
# Add 'example.txt' to Git and commit with message 'Initial commit'
# Your code here

Hint

Use git add to stage files and git commit -m to commit with a message.

3

Modify the file to make the working directory dirty

Change the content of example.txt by adding the line New line to make the working directory dirty.

Git

git init

echo "Hello Git" > example.txt

git add example.txt

git commit -m "Initial commit"
# Add a new line 'New line' to 'example.txt'
# Your code here

Hint

Use echo "New line" >> example.txt to append a line to the file.

4

Check if the working directory is clean or dirty

Run the command git status --short to see if the working directory is clean or dirty. The output should show the modified file.

Git

git init

echo "Hello Git" > example.txt

git add example.txt

git commit -m "Initial commit"

echo "New line" >> example.txt
# Run 'git status --short' to check working directory status
# Your code here

Hint

The output line starting with M means the file is modified and the working directory is dirty.

Practice

1. What does it mean when your Git working directory is described as clean?

easy

A. There are conflicts from a merge.

B. There are untracked files present.

C. There are changes staged but not committed.

D. There are no changes to commit; all files are saved in Git.

Solution

1. Step 1: Understand the meaning of a clean working directory

   A clean working directory means no changes are pending to be committed or staged.

2. Step 2: Compare with other states

   Untracked files, staged changes, or conflicts mean the directory is dirty, not clean.

3. Final Answer:

   There are no changes to commit; all files are saved in Git. -> Option D

4. Quick Check:

   Clean working directory = no uncommitted changes [OK]

Hint: Clean means no changes to commit or stage [OK]

Common Mistakes:

• Confusing staged changes with clean state
• Thinking untracked files mean clean
• Assuming conflicts mean clean

2. Which Git command correctly shows the current state of your working directory?

easy

A. git push origin main

B. git commit -m "status"

C. git status

D. git checkout

Solution

1. Step 1: Identify the command to check working directory state

   The command git status shows staged, unstaged, and untracked changes.

2. Step 2: Eliminate other commands

   git commit saves changes, git push uploads commits, git checkout switches branches or files.

3. Final Answer:

   git status -> Option C

4. Quick Check:

   Check working directory state = git status [OK]

Hint: Use 'git status' to see working directory changes [OK]

Common Mistakes:

• Using git commit to check status
• Confusing git push with status check
• Using git checkout incorrectly

3. You run git status and see:

Changes not staged for commit:
  modified:   app.js

What is the state of your working directory?

medium

A. Dirty working directory with unstaged changes

B. Dirty working directory with staged changes

C. Clean working directory

D. Detached HEAD state

Solution

1. Step 1: Interpret the git status output

   The message "Changes not staged for commit" means files are modified but not added to staging.

2. Step 2: Determine working directory state

   Unstaged changes mean the directory is dirty, not clean, and changes are not staged.

3. Final Answer:

   Dirty working directory with unstaged changes -> Option A

4. Quick Check:

   Unstaged changes = dirty directory [OK]

Hint: Unstaged changes mean dirty directory [OK]

Common Mistakes:

• Confusing unstaged with staged changes
• Assuming clean when files are modified
• Mixing detached HEAD with working directory state

4. You see this output after running git status:

On branch main
Changes to be committed:
  modified:   index.html

But you want to check if your working directory is clean. What should you do?

medium

A. Run git reset HEAD index.html to unstage changes

B. Run git commit to save changes

C. Run git add index.html again

D. Run git checkout index.html to stage changes

Solution

1. Step 1: Understand the meaning of staged changes

   "Changes to be committed" means files are staged but not committed, so directory is dirty.

2. Step 2: Unstage changes to check clean state

   Running git reset HEAD index.html unstages the file, showing if working directory has unstaged changes.

3. Final Answer:

   Run git reset HEAD index.html to unstage changes -> Option A

4. Quick Check:

   Unstage changes to check clean state [OK]

Hint: Unstage files with git reset HEAD to check clean state [OK]

Common Mistakes:

• Adding files again instead of unstaging
• Committing without checking unstaged changes
• Using git checkout to stage files (wrong)

5. You modified two files: app.py and README.md. You staged app.py but not README.md. What will git status show?

hard

A. No changes to commit, working directory clean

B. Changes to be committed: app.py; Changes not staged for commit: README.md

C. Changes not staged for commit: app.py and README.md

D. Untracked files: app.py and README.md

Solution

1. Step 1: Identify staged and unstaged files

   app.py is staged, so it appears under "Changes to be committed".

2. Step 2: Identify unstaged files

   README.md is modified but not staged, so it appears under "Changes not staged for commit".

3. Final Answer:

   Changes to be committed: app.py; Changes not staged for commit: README.md -> Option B

4. Quick Check:

   Staged vs unstaged files shown separately [OK]

Hint: Staged files show as 'to be committed', unstaged as 'not staged' [OK]

Common Mistakes:

• Assuming all modified files are staged
• Confusing untracked with modified files
• Thinking working directory is clean with staged changes