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

Fix whitespace problems #14

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Conversation

tvrusso
Copy link
Contributor

@tvrusso tvrusso commented Nov 8, 2017

The last four commits on master were done from Windows files (with CRLF line endings) and were uploaded directly to GitHub using the "Upload Files" button instead of git add/commit/push operations. As such, git is having severe problems on checkout --- as soon as the files are checked out, the line endings are automatically changed again, and then git claims they're modified, uncommitted files.

This automatic line end conversion thing means that git won't let you change branches without saving these changes --- and even if you do, when you change back to the master branch, you get the same conversion problem again.

This pull request fixes up those problems by reverting the four commits with whitespace problems, then re-doing them without the CRLF line endings.

I described the exact process for doing this in an email to Don, but this was the process:

git checkout -b redo-four-commits  fb8a3d1
git diff -b fb8a3d1..3b9a37d | patch -p1 -l
git add Tools/Scripts/IGT4SAR_MissingPersonForm.py
git commit  (then add your "Updates SQL..." commit message)
git diff -b 3b9a37d..13c1560 | patch -p1 -l
git add \~LoadMapSAREXTools.bat \~UninstallMapSAREXTools.bat
git commit (add your "updated for 10.6" commit message)
git diff -b 13c1560..4cf2dae | patch -p1 -l
git add README.md
git commit (add your "updated typos" commit message)
git diff -b 4cf2dae..6d604d8 | patch -p1 -l
git add Tools/Scripts/IGT4SAR_Mapbook.py
git commit (add your "Updated mapbook tool" commit message)
git clean -f  (get rid of patch's droppings)

git checkout -b fix-whitespace 6d604d8   
# that is the commit pointed to by master right after the four problem commits)
git revert fix-whitespace~4..fix-whitespace
# that creates revert commits for the four problem commits
git merge redo-four-commits

The result is that we recreate, one by one, the effect of the four problem commits, without introducing the same whitespace problems (diff -b and patch -l are the key here).

If you now do "git diff -b fix-whitespace master" (ignoring whitespace) you'll see no differences, but if you leave off the -b you'll see tons of differences.

Updates SQL where statement for acquiring Lead Agency information
updated install / uninstall for 10.5 and 10.6
Added error checking in case text objects were missing or replaced on
the template layout.
This reverts commit 4cf2dae.
This reverts commit 13c1560.
This commit re-introduces four problem commits that had to be
reverted, but does so without introducing wierd whitespace errors.
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.

1 participant