Is there a git diff command that ignores whether the order of lines changed?

user_8038943 0
Viewed 280

I have a system that is retrieving .xml files from a Salesforce organization. For some of the files, their line number ordering shifts on subsequent retrievals. So if I do the following:

  1. Retrieve a file
  2. Commit its contents
  3. Re-retrieve the file
  4. Commit its contents

It's completely possible that the order of the lines in the XML has changed, which causes the diff checker to think that the file has had changes made when that's not the case. Is there any git command or strategy that would help cut down the commit clutter? Perhaps something that simplifies a diff down to a set of the lines, and solely checks whether any of the lines in the set have changes.

salesforce git-diff diff xml git
1 Answers

You could write a parser that rewrites your xml files in a consistent order, and use it to reformat your files before staging them.

You could then use this parser as a clean filter (scroll down a bit to view the explanations) to have git automatically apply it on the files you choose.

user_860720
Related