Tabs to whitespaces #1201
Merged
Tabs to whitespaces #1201
Conversation
This file contains hidden or 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
|
👍 |
|
⏩ |
|
I must admit, the proposed plan is not quite working on non-simplistic branches. |
|
More (computationally) expensive, but working for me plan. (A, M, T branches as above)
Questions and improvements are welcome. |
|
Tom has reported a successful result using the second approach for the updating of the branches. |
Merged
|
OpenGeoSys development has been moved to GitLab. |
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.
As discussed about one week ago here is a PR changing tabs to 4 whitespaces almost everywhere. The configs are updated too; add
?ws=1to the address line when viewing the diff like here: diff ignoring whitespace changes.Almost all of your branches will have merge/rebase conflicts. To resolve those as painless as possible there is a small script and some command with explanation, but before you make any changes make a backup. Like real backup, not a shallow clone, because if you destroy you .git/* the behaviour is undefined. Don't ask me how I know.
Plan (which didn't work like expected. See another plan in the comments.):
for any branch:
git filter-branchYou will need a small script named
t2ws.shfrom this gistLet's assume you have a branch A somewhere. The current master is M. The merged TabsToWhitespaces PR is T:
git rebase M A(this is your usual business). The new branch is called A':git filter-branch -f --tree-filter "git diff --name-only --diff-filter=AM ${GIT_COMMIT}^ | xargs t2ws.sh" M..A'Let's call the rewritten history of A' as A'':git rebase -Xignore-all-space T A''yields the following graph ignoring the whitespace changes:The filter-branch works like this: the --tree-filter checks out every commit (specified by the range M..A above) and runs a given command. The
git diff --name-only --diff-filter=AM ${GIT_COMMIT}^print file names which were added/modified since previous commit, the${GIT_COMMIT}^. (Try it at any of your branches to see the output. The command is harmless.) This files are then processed by the script, which ignores empty input and non-regular-file input (like directories e.g.Tests/Data). Then filter-branch's tree-filter makes a new commit and goes to the next one.Don't forget to backup!
Addendum: Sometimes (when skipping the first step for example), after the step 3 there could be new tabs in the code. One can check for this with
git diff --name-only --diff-filter=AM ufz/master | xargs grep '\t'or something like this.