By default, git apply does not verify that the rest of the file (outside the hunk being applied) has remained unchanged. It only checks if the hunk itself can be applied cleanly to the target file. If the file has changed elsewhere, git apply will still apply the patch as long as the hunk context matches, which can sometimes lead to conflicts or unintended changes.

---

How to Make git apply Verify the Entire File

To ensure that the file has not changed anywhere except in the hunk you want to apply, you have a few options:

1. Use git apply --check

• This will check if the patch can be applied cleanly, but it does not verify that the rest of the file is unchanged.
• Example:

  bash
  Copy
  git apply --check your.patch

2. Use git apply --reject and Manually Inspect

• This will apply the patch and leave rejected hunks if there are conflicts, but again, it does not verify the rest of the file.

3. Use git diff to Compare the Entire File

• Before applying the patch, compare the current file with the expected state (e.g., the file before any changes were made).
• Example:

  bash
  Copy
  git diff --exit-code expected_file current_file

• If the exit code is 0, the files are identical (except for the hunk you want to apply).

4. Use a Script to Verify the File

• Write a script to compare the file (excluding the hunk) with a known good version before applying the patch.
• Example (pseudo-code):

  bash
  Copy
  #!/bin/bash
  # Compare the file (excluding the hunk) with a known good version
  if diff <(sed '/hunk pattern/d' current_file) <(sed '/hunk pattern/d' expected_file); then
    git apply your.patch
  else
    echo "File has changed elsewhere. Aborting."
    exit 1
  fi

5. Use git apply --3way (if using Git 2.36+)

• This option uses a 3-way merge to apply the patch, which can help detect conflicts, but it still does not verify the entire file.

---

Best Practice

If you want to ensure the file is exactly as expected (except for the hunk), the most reliable approach is to:

1. Check out the expected version of the file (e.g., from a known commit).
2. Apply the patch to that file.
3. Compare the result with the current file to ensure no unintended changes exist.

Would you like help writing a script for this workflow?