Use patience algorithm for diffs

code-asher · code-asher · commit 9fb661d91ea7 · 2020-12-15T11:14:56.000-06:00
This should prevent us from generating different diffs and adding noise
to our PRs. Patience seems like a good one; it generated a diff that I
felt was easier to read in the case of the yarn.lock optionator section.
diff --git a/ci/dev/diff-vscode.sh b/ci/dev/diff-vscode.sh
@@ -6,7 +6,7 @@ main() {
 
   cd ./lib/vscode
   git add -A
-  git diff HEAD --full-index > ../../ci/dev/vscode.patch
+  git diff HEAD --patience --full-index > ../../ci/dev/vscode.patch
 }
 
 main "$@"

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ main() {`
`6`	`6`
`7`	`7`	`cd ./lib/vscode`
`8`	`8`	`git add -A`
`9`		`- git diff HEAD --full-index > ../../ci/dev/vscode.patch`
	`9`	`+ git diff HEAD --patience --full-index > ../../ci/dev/vscode.patch`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`main "$@"`