-1

I want to take a patch and apply it in another repository, both the local repository are up to date. I just changed indentation and few lines in the file and took patch using git diff and applied it in another local repository. The patch applied successfully along with the indentation changes. But I need only the changes in code to be applied. So I tried git diff -w and took a patch. This patch was fine only with the code changes. Changes due to indentation were omitted. But when tried to apply the patch. Patch is not getting applied. It’s showing error in the part which I haven't touched. Don't know what’s actually happening.

If I replaced the error part with what is actually in patch. This error part is applied and again showing error in next few lines. Similarly it continues.

S.S. Anne
  • 15,171
  • 8
  • 38
  • 76
Sheik
  • 17
  • 7

2 Answers2

0

Check the 'Whitespace' options (for git apply).

maybe My diff contains trailing whitespace - how to get rid of it? matches your use case.

Philip Oakley
  • 13,333
  • 9
  • 48
  • 71
0

you may use combinediff with -w option from patchutils [1]

git diff | combinediff - /dev/null -w > patchname.patch

[1] https://github.com/twaugh/patchutils
https://repology.org/project/patchutils/versions

Sérgio
  • 6,966
  • 1
  • 48
  • 53