git add –interactive “Your edited hunk does not apply”

by

Is this like in this git-add post?

Manually editing the hunk is immensely powerful, but also a bit complicated if you’ve never done it before.
The most important thing to keep in mind: The diff is always indented with one character in addition to whatever other indentation is there.
The character can either be:

  • a space (indicates an unchanged line),
  • a - indicating that the line was removed,
  • or a + indicating that the line was added.

Nothing else. It must be either a space, a – or a +. Anything else, and you’ll get errors
(there’s no character for a changed line, since those are handled by removing the old line, and adding the changed one as new).

Since you’ve got the diff open in your favorite text editor (you did configure Git to use your favorite text editor, right?), you can do whatever you want – as long as you make sure the resulting diff applies cleanly.

And therein lies the trick. If you’ve never done this before, Git will tell you “Your edited hunk does not apply. Edit again?” so often, you’ll start to hate yourself for your inability to figure this out, even though it seems so easy (or Git because it can’t figure out what you want).

One thing that tripped me up quite often was that I forgot the one character indent.
I’d mark a line with a – to be removed, but in most text editors that inserts a -, it doesn’t overwrite the space that was there before. This means you’re adding an additional space to the whole line, which in turn means the diff algorithm can’t find/match the line in the original file, which in turn means Git will yell at you.

The other thing is that the diff still has to make sense. “Sense” means that it can be applied cleanly. Exactly how you create a sensible diff seems to be a bit of an dark art (at least to me right now), but you should always keep in mind how the original file looked like, and then plan your -s and +s accordingly. If you edit your hunks often enough you’ll eventually get the hang of it.

See also this commit on git add -p.

Ortomala Lokni‘s answer refers to Joaquín Windmüller blog post “Selectively select changes to commit with git (or Imma edit your hunk)“

Instead of counting lines, what Git would like to do is to coalesce overlapping hunks (when one is edited) before applying said edited hunk.
That was discussed mid-2018, and would avoid scenario like:

if you split a hunk, edit the first subhunk, transforming a
trailing context line to a deletion then if you try to stage the
second subhunk, it will fail.

More Related Contents:

  1. Message ‘src refspec master does not match any’ when pushing commits in Git
  2. Difference between “git add -A” and “git add .”
  3. Passing arguments to an interactive program non-interactively
  4. Undo git reset –hard with uncommitted files in the staging area
  5. How to move certain commits to be based on another branch in git?
  6. git add * (asterisk) vs git add . (period)
  7. What’s the difference between `git add .` and `git add -u`?
  8. How to assign the result of the previous expression to a variable?
  9. Fix GitLab error: “you are not allowed to push code to protected branches on this project”?
  10. Checking for interactive shell in a Python script
  11. Add all files to a commit except a single file?
  12. Get output from a Paramiko SSH exec_command continuously
  13. Windows Installer “Error 1308. Source file not found” when uninstalling patch in sequence scenario
  14. Can I split an already split hunk with git?
  15. How to apply a git patch from one repository to another?
  16. Methods to hex edit binary files via Powershell
  17. How to fill user input for interactive command for “RUN” command?
  18. Tell if Python is in interactive mode
  19. How can I start an interactive console for Perl?
  20. Is there a way to squash a number of commits non-interactively?
  21. Write byte at address (hexedit/modify binary from the command line)
  22. Does the jQuery ajax call support PATCH?
  23. Git: How to create patches for a merge?
  24. How to prevent Vista from requiring elevation on patch.exe?
  25. How to apply `git diff` patch without Git installed?
  26. How do I apply a diff patch on Windows?
  27. How to apply a Git patch to a file with a different name and path?
  28. How do I create binary patches?
  29. Replace a class within the Java class library with a custom version
  30. How do you squash commits into one patch with git format-patch?

Leave a Comment