Skip to content

Conversation

vng
Copy link
Contributor

@vng vng commented Feb 15, 2022

Closes #267

@hannesa2
Copy link
Contributor

May I ask you to show a sample/screenshot to easier understand what it solves ?

@vng
Copy link
Contributor Author

vng commented Feb 15, 2022

Example on my open source project. This commit (can view diff on github with or without whitespaces): organicmaps/organicmaps@0953643

Turn off "Show whitespace differences"

Before changeset - whitespaces are still present in diff:
Screenshot 2022-02-15 at 11 55 52

After changeset - whitespaces has gone in diff:
Screenshot 2022-02-15 at 11 59 13

@hannesa2
Copy link
Contributor

hannesa2 commented Feb 15, 2022

Best would have a switch in preferences to be able to toggle, but I'm fine like it is 👍
Thanks a lot !

If you need a new version, please let me know

@hannesa2 hannesa2 merged commit fc53ca1 into gitx:master Feb 15, 2022
@vng
Copy link
Contributor Author

vng commented Feb 15, 2022

Hm, but "Show whitespace differences" check in preferences is already about that, or you mean something else?
I just fixed that to work properly.

@hannesa2
Copy link
Contributor

Really ? I didn't found it. Where ?

image

@vng
Copy link
Contributor Author

vng commented Feb 15, 2022

:) You have "Integration" tab active. Current Preferences view looks ugly, see my issue a year ago #219

Screenshot 2022-02-15 at 15 01 18

Press on General button. General/Integration/Updates should be the buttons on a toolbar, like it was 2 years ago .. Seems like MacOS 11 SDK broke it, I'm not a professional in UI development.

@vng
Copy link
Contributor Author

vng commented Feb 15, 2022

This is how it was 2 years ago and should look like:
Screenshot 2022-02-15 at 15 05 09

@hannesa2
Copy link
Contributor

2 years ago it was much better !
Now you have to push this button, to see settings.

image

Without your help, I would never find it. Ok, there is no need for it, but anyway !

@vng
Copy link
Contributor Author

vng commented Feb 15, 2022

If you need a new version, please let me know

@hannesa2 Should we set ONLY_ACTIVE_ARCH = YES; in Debug and Release for MGScopeBar, ObjectiveGit and Sparkle frameworks like its set in main GitX project?

I tried to build Release and failed because I don't have arm64 libgit2, libssh2 to link into ObjectiveGit.

@hannesa2
Copy link
Contributor

hannesa2 commented Feb 15, 2022

Please make a pull request, and I'll try it out on my arm64 side.

Just for the records, these are the current settings
image

@hannesa2
Copy link
Contributor

I tried to build Release and failed because I don't have arm64 libgit2, libssh2 to link into ObjectiveGit.

But at least the x86_64 build should work on your side

@vng
Copy link
Contributor Author

vng commented Feb 15, 2022

ObjectiveGit has ONLY_ACTIVE_ARCH = YES only in Debug, so my x64 machine tries to build arm64 ObjectiveGit in Release and fails.

Please, try it by yourself, because I should change submodules, but I'm unable to push into them. Making forks of all submodules is a mess :)

@hannesa2
Copy link
Contributor

For External/Sparkle we use no fork. Makes this all sense without Sparkle ?
I want to avoid to create a new fork of Sparkle just because of this single switch

@vng
Copy link
Contributor Author

vng commented Feb 15, 2022

I think ObjectiveGit will be enough

@hannesa2
Copy link
Contributor

Here you go

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Show whitespace differences" check in Preferences doesn't work.
2 participants