Re: [PATCH v6 00/14] Serialized Git Commit Graph
- From
Derrick Stolee <stolee@gmail.com>
- Date
- Mar 19, 2018, 13:10 UTC
- Message-ID
- <e9062408-0983-2e47-4338-4ab1823bb9bd@gmail.com>
- In-Reply-To
- <54BC2335-72B3-404E-AA4A-368DEB121C8E@gmail.com>
On 3/16/2018 12:28 PM, Lars Schneider wrote:
Show 26 quoted lines
> >> On 14 Mar 2018, at 21:43, Junio C Hamano <gitster@pobox.com> wrote: >> >> Derrick Stolee <stolee@gmail.com> writes: >> >> >>> Hopefully this version is ready to merge. I have several follow-up topics >>> in mind to submit soon after, including: >> A few patches add trailing blank lines and other whitespace >> breakages, which will stop my "git merge" later to 'next' and down, >> as I have a pre-commit hook to catch them. > @stolee: > > I run "git --no-pager diff --check $BASE_HASH...$HEAD_HASH" to detect > these kinds of things. I run this as part of my "prepare patch" [1] script > which is inspired by a similar script originally written by Dscho. > > Do you think it would make sense to mention (or even > recommend) such a script in your awesome GfW CONTRIBUTING.md? > > > - Lars > > > [1] https://github.com/larsxschneider/git-list-helper/blob/master/prepare-patch.sh#L71 >
Thanks for the suggestions. Somehow I got extra whitespace doing copy/paste in vim and I never re-opened that file in my normal editor (VS Code with an extension that shows trailing whitespace).
On 3/15/2018 1:23 PM, Johannes Schindelin wrote:
> git log --check` > was introduced to show you whitespace problems). If all of those > whitespace issues are unintentional, you can fix them using `git rebase > --whitespace=fix` in the most efficient way.
Thanks for both of the suggestions. The `rebase` check was already in the document, so I put the checks immediately above that line. PR is available now [1].
Thanks, -Stolee
[1] https://github.com/git-for-windows/git/pull/1567