Re: [PATCH v6 00/14] Serialized Git Commit Graph
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Mar 15, 2018, 17:23 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1803151821270.64@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
- In-Reply-To
- <xmqq605yz8ue.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Wed, 14 Mar 2018, Junio C Hamano wrote:
> 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.
I wonder how you cope with the intentional "whitespace breakage" caused by a TAB after HS in my recreate-merges patch series...
Show 5 quoted lines
> Here is the output from my "git am -s" session. > > Applying: csum-file: rename hashclose() to finalize_hashfile() > Applying: csum-file: refactor finalize_hashfile() method > .git/rebase-apply/patch:109: new blank line at EOF.
Stolee, you definitely want to inspect those changes (`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.
Ciao, Dscho