Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

global: fix whitespace errors #97

Merged
merged 1 commit into from
Aug 15, 2024
Merged

Conversation

pks-t
Copy link
Member

@pks-t pks-t commented Aug 6, 2024

There are multiple places with broken whitespace formatting as pointed out by git-apply(1). Fix these to make the command happy.

gitster pushed a commit to gitster/git that referenced this pull request Aug 6, 2024
Fix whitespace errors in the clar that make git-apply(1) unhappy. This
has been cherry-picked from the upstream pull request at [1].

[1]: clar-test/clar#97

Signed-off-by: Patrick Steinhardt <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
gitster pushed a commit to gitster/git that referenced this pull request Aug 8, 2024
Fix whitespace errors in the clar that make git-apply(1) unhappy. This
has been cherry-picked from the upstream pull request at [1].

[1]: clar-test/clar#97

Signed-off-by: Patrick Steinhardt <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
gitster pushed a commit to git/git that referenced this pull request Aug 13, 2024
Fix whitespace errors in the clar that make git-apply(1) unhappy. This
has been cherry-picked from the upstream pull request at [1].

[1]: clar-test/clar#97

Signed-off-by: Patrick Steinhardt <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
There are multiple places with broken whitespace formatting as pointed
out by git-apply(1). Fix these to make the command happy.
@pks-t pks-t force-pushed the pks-whitespace-fixes branch from 6437c9e to b7e3a1c Compare August 14, 2024 05:58
@ethomson
Copy link
Member

I'm happy to merge this whenever y'all are ready. 🙏

@pks-t
Copy link
Member Author

pks-t commented Aug 15, 2024

@ethomson I'd propose to just merge this right away. That'd allow me to update the downstream patch series in Git to get rid of the two additional patches.

@ethomson ethomson merged commit 1516124 into clar-test:main Aug 15, 2024
2 checks passed
gitster pushed a commit to gitster/git that referenced this pull request Aug 15, 2024
Fix whitespace errors in the clar that make git-apply(1) unhappy. This
has been cherry-picked from the upstream pull request at [1].

[1]: clar-test/clar#97

Signed-off-by: Patrick Steinhardt <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants