如何取消Git中已应用的调试stash？求临时调试代码管理方案

Great question—dealing with temporary debug code in Git can be tricky, especially when you don’t want to clutter your commit history or spend time manually undoing changes. Let’s break this down into two clear parts: undoing an applied stash, and better workflows for managing your debug code long-term.

First, let’s cover the scenario where you used git stash apply (not pop) to bring in your debug code. Since apply leaves the stash intact in your stash list, reversing it is straightforward:

• Run this command to reverse the changes from your most recent stash (replace stash@{0} with the specific stash ID if you need an older one):

  git stash show -p stash@{0} | git apply -R
  

  Here’s what each part does:
  • git stash show -p generates a patch file of the stash’s changes
  • | git apply -R pipes that patch to Git and applies it in reverse, undoing every change from the stash

If you accidentally used git stash pop (which removes the stash from the list), don’t panic—Git still tracks it in the reflog:

1. Find the hash of your old stash with git reflog (look for entries like stash@{0}: WIP on main: ...)
2. Reverse the changes using the hash:

   git show <stash-hash> | git apply -R
   

Stashes work, but they’re not the most flexible for ongoing debugging. Here are a few better approaches:

• Use a dedicated debug branch
  Instead of applying stashes directly to your working branch, create a temporary branch to hold your debug code:

  git stash branch debug-temp stash@{0}
  

  This creates a new branch from the commit where you created the stash, applies the stash, and switches to it. When you’re done debugging:

  • Switch back to your original branch with git checkout main (replace with your branch name)
  • Delete the debug branch with git branch -D debug-temp
    No messy manual cleanup needed—your main branch stays pristine.

• Leverage Git Worktrees
  If you don’t want to switch branches mid-work, use Git worktrees to create a separate working directory for debugging:

  git worktree add ../debug-worktree
  cd ../debug-worktree
  git stash apply stash@{0}
  

  You can debug here without touching your main working directory. When finished, just delete the worktree:

  git worktree remove ../debug-worktree
  

• Add conditional debug code to your project
  Instead of stashing debug code entirely, wrap it in conditional checks so you can toggle it on/off without Git changes. For example:

  # In Python
  DEBUG = False
  
  if DEBUG:
      # Your debug code here
      print("Debug mode enabled")
      logging.debug("Detailed debug logs")
  

  Then enable debugging by setting DEBUG = True (or using environment variables/compile flags for compiled languages like C/C++). This way, your debug code lives in the repo but doesn’t affect production builds.

• Use "WIP" temporary commits
  If you prefer commits over stashes, make a temporary "Work In Progress" commit:

  git add .
  git commit -m "WIP: Debug code for X issue"
  

  When you’re done debugging, you can either:

  • Undo the commit and move changes back to your working directory: git reset HEAD~1
  • Merge the debug code into your actual fix commit: git commit --amend (only do this if you haven’t pushed the original commit to remote!)

内容的提问来源于stack exchange，提问作者Sergey Senkov