From 1d9b7503c9cf3ca7e6cebcb03ee5d773fb78ae8c Mon Sep 17 00:00:00 2001 From: Wesley Schwengle Date: Thu, 28 Mar 2019 10:25:00 +0100 Subject: [PATCH] Fix bug where git diff always differs with upstream When running generate I get a lot of differences in DevelPatchPerl.patch because git's `diff.mnemonicprefix` is set to `true`. To mitigate this, use `git -c 'diff.mnemonicprefix=false' diff` so everything is the same as upstream. --- generate.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate.pl b/generate.pl index 622f4fe..2b16936 100755 --- a/generate.pl +++ b/generate.pl @@ -133,7 +133,7 @@ for my $release (@{$config->{releases}}) { die "Couldn't create a temp git repo for $release->{version}" if $? != 0; Devel::PatchPerl->patch_source($release->{version}, $dir); $patch = qx{ - cd $dir && git diff + cd $dir && git -c 'diff.mnemonicprefix=false' diff }; die "Couldn't create a Devel::PatchPerl patch for $release->{version}" if $? != 0; }