CVE-2014-9390 git: arbitrary command execution vulnerability on case-insensitive file systems

[Hipska]

See #3

[ghoneycutt]

Looks great! Could you please squash these commits into one commit and I will merge.

[Hipska]

Any reason why this should be done? I would rather not alter my history..

[ghoneycutt]

This is common practice when sending a pull request so that when you read through the history of the project you see logical commits instead of "typo", "typo", "fixing newlines", etc.

Rebasing your master branch is not a good idea, because if people base their work on that and the history changes, then merging will break. For topic brances like this, it is a normal activity done before merging.

To do so, checkout out your branch and run git log. Notice the commit sha before your first commit. Then run git rebase -i <SHA>. Leave your first commit alone and all commits after that, change them to 's' for squash. Once you save that you can rewrite the commit message for all of them. Don't worry about my commit in there, squash it as your own.

[ghoneycutt]

Check out the commit log for facter - https://github.com/puppetlabs/facter/commits/master

It is not that those people don't screw up any, they just rebase the code before merging :)

[Hipska]

Well, now you can do squash merge commits with Github 😉

[Hipska]

@ghoneycutt ?