tsflower: Make patches more reproducible between machines/developers #5407
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Jun 9, 2022
When Chris today first made a change that called for refreshing these patches, after the first few revisions to them had all been done on my machine, we learned that `git format-patch` adds this trailer line with the Git version, causing churn: zulip@b202178bb zulip#5393 (comment) Normalize that line so that it stops causing churn in the future.
This was causing a small bit of churn (not as much as the Git-version trailer) when going between patches generated on my machine and on Chris's. I think the value I have in my local config (and reflected unintentionally in the first versions of these patches) tends to make diffs a bit easier to read than the default, so go back to that.
Since I'm looking at these diff config options, take the opportunity to make this small cleanup.
chrisbobbe
force-pushed
the
pr-tsflower-reproducible-patches
branch
from
8712aef to
5373ba4
Compare
|
Thanks, LGTM! Merged. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
tools/tsflower: Normalize away Git version line from format-patch
When Chris today first made a change that called for refreshing
these patches, after the first few revisions to them had all been
done on my machine, we learned that
git format-patchadds thistrailer line with the Git version, causing churn:
b202178bb
#5393 (comment)
Normalize that line so that it stops causing churn in the future.
tools/tsflower: Make patches reproducible across diff.interHunkContext
This was causing a small bit of churn (not as much as the
Git-version trailer) when going between patches generated on
my machine and on Chris's.
I think the value I have in my local config (and reflected
unintentionally in the first versions of these patches) tends to make
diffs a bit easier to read than the default, so go back to that.
tools/tsflower: Set diff.noprefix, to clean up patch format slightly
Since I'm looking at these diff config options, take the opportunity
to make this small cleanup.