From: Derrick Stolee <stolee@gmail.com> To: Lars Schneider <larsxschneider@gmail.com> Cc: Git List <git@vger.kernel.org>, Jeff King <peff@peff.net>, Stefan Beller <sbeller@google.com>, SZEDER Gábor <szeder.dev@gmail.com>, Ramsay Jones <ramsay@ramsayjones.plus.com>, git@jeffhostetler.com, Derrick Stolee <dstolee@microsoft.com>, Junio C Hamano <gitster@pobox.com>, Johannes Schindelin <johannes.schindelin@gmx.de> Subject: Re: [PATCH v6 00/14] Serialized Git Commit Graph Date: Mon, 19 Mar 2018 09:10:12 -0400 Message-ID: <e9062408-0983-2e47-4338-4ab1823bb9bd@gmail.com> (raw) In-Reply-To: <54BC2335-72B3-404E-AA4A-368DEB121C8E@gmail.com> On 3/16/2018 12:28 PM, Lars Schneider wrote: > >> 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
next prev parent reply index Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-27 2:32 [PATCH v5 00/13] " Derrick Stolee 2018-02-27 2:32 ` [PATCH v5 01/13] commit-graph: add format document Derrick Stolee 2018-02-27 2:32 ` [PATCH v5 02/13] graph: add commit graph design document Derrick Stolee 2018-02-27 2:32 ` [PATCH v5 03/13] commit-graph: create git-commit-graph builtin Derrick Stolee 2018-02-27 2:32 ` [PATCH v5 04/13] csum-file: add CSUM_KEEP_OPEN flag Derrick Stolee 2018-03-12 13:55 ` Derrick Stolee 2018-03-13 21:42 ` Junio C Hamano 2018-03-14 2:26 ` Derrick Stolee 2018-03-14 17:00 ` Junio C Hamano 2018-02-27 2:32 ` [PATCH v5 05/13] commit-graph: implement write_commit_graph() Derrick Stolee 2018-02-27 2:33 ` [PATCH v5 06/13] commit-graph: implement 'git-commit-graph write' Derrick Stolee 2018-02-27 2:33 ` [PATCH v5 07/13] commit-graph: implement git commit-graph read Derrick Stolee 2018-02-27 2:33 ` [PATCH v5 08/13] commit-graph: add core.commitGraph setting Derrick Stolee 2018-02-27 2:33 ` [PATCH v5 09/13] commit-graph: close under reachability Derrick Stolee 2018-02-27 2:33 ` [PATCH v5 10/13] commit: integrate commit graph with commit parsing Derrick Stolee 2018-02-27 2:33 ` [PATCH v5 11/13] commit-graph: read only from specific pack-indexes Derrick Stolee 2018-02-27 20:15 ` Stefan Beller 2018-02-27 2:33 ` [PATCH v5 12/13] commit-graph: build graph from starting commits Derrick Stolee 2018-02-27 2:33 ` [PATCH v5 13/13] commit-graph: implement "--additive" option Derrick Stolee 2018-02-27 18:50 ` [PATCH v5 00/13] Serialized Git Commit Graph Stefan Beller 2018-03-14 19:27 ` [PATCH v6 00/14] " Derrick Stolee 2018-03-14 19:27 ` [PATCH v6 01/14] csum-file: rename hashclose() to finalize_hashfile() Derrick Stolee 2018-03-14 19:27 ` [PATCH v6 02/14] csum-file: refactor finalize_hashfile() method Derrick Stolee 2018-03-14 19:27 ` [PATCH v6 03/14] commit-graph: add format document Derrick Stolee 2018-03-14 19:27 ` [PATCH v6 04/14] graph: add commit graph design document Derrick Stolee 2018-03-14 19:27 ` [PATCH v6 05/14] commit-graph: create git-commit-graph builtin Derrick Stolee 2018-03-14 19:27 ` [PATCH v6 06/14] commit-graph: implement write_commit_graph() Derrick Stolee 2018-03-14 19:27 ` [PATCH v6 07/14] commit-graph: implement 'git-commit-graph write' Derrick Stolee 2018-03-18 13:25 ` Ævar Arnfjörð Bjarmason 2018-03-19 13:12 ` Derrick Stolee 2018-03-19 14:36 ` Ævar Arnfjörð Bjarmason 2018-03-19 18:27 ` Derrick Stolee 2018-03-19 18:48 ` Ævar Arnfjörð Bjarmason 2018-03-14 19:27 ` [PATCH v6 08/14] commit-graph: implement git commit-graph read Derrick Stolee 2018-03-14 19:27 ` [PATCH v6 09/14] commit-graph: add core.commitGraph setting Derrick Stolee 2018-03-14 19:27 ` [PATCH v6 10/14] commit-graph: close under reachability Derrick Stolee 2018-03-14 19:27 ` [PATCH v6 11/14] commit: integrate commit graph with commit parsing Derrick Stolee 2018-03-14 19:27 ` [PATCH v6 12/14] commit-graph: read only from specific pack-indexes Derrick Stolee 2018-03-15 22:50 ` SZEDER Gábor 2018-03-19 13:13 ` Derrick Stolee 2018-03-14 19:27 ` [PATCH v6 13/14] commit-graph: build graph from starting commits Derrick Stolee 2018-03-14 19:27 ` [PATCH v6 14/14] commit-graph: implement "--additive" option Derrick Stolee 2018-03-14 20:10 ` [PATCH v6 00/14] Serialized Git Commit Graph Ramsay Jones 2018-03-14 20:43 ` Junio C Hamano 2018-03-15 17:23 ` Johannes Schindelin 2018-03-15 18:41 ` Junio C Hamano 2018-03-15 21:51 ` Ramsay Jones 2018-03-16 11:50 ` Johannes Schindelin 2018-03-16 17:27 ` Junio C Hamano 2018-03-19 11:41 ` Johannes Schindelin 2018-03-16 16:28 ` Lars Schneider 2018-03-19 13:10 ` Derrick Stolee [this message] 2018-03-16 15:06 ` Ævar Arnfjörð Bjarmason 2018-03-16 16:38 ` SZEDER Gábor 2018-03-16 18:33 ` Junio C Hamano 2018-03-16 19:48 ` SZEDER Gábor 2018-03-16 20:06 ` Jeff King 2018-03-16 20:19 ` Jeff King 2018-03-19 12:55 ` Derrick Stolee 2018-03-20 1:17 ` Derrick Stolee 2018-03-16 20:49 ` Jeff King 2018-04-02 20:34 ` [PATCH v7 " Derrick Stolee 2018-04-02 20:34 ` [PATCH v7 01/14] csum-file: rename hashclose() to finalize_hashfile() Derrick Stolee 2018-04-02 20:34 ` [PATCH v7 02/14] csum-file: refactor finalize_hashfile() method Derrick Stolee 2018-04-07 22:59 ` Jakub Narebski 2018-04-02 20:34 ` [PATCH v7 03/14] commit-graph: add format document Derrick Stolee 2018-04-07 23:49 ` Jakub Narebski 2018-04-02 20:34 ` [PATCH v7 04/14] graph: add commit graph design document Derrick Stolee 2018-04-08 11:06 ` Jakub Narebski 2018-04-02 20:34 ` [PATCH v7 05/14] commit-graph: create git-commit-graph builtin Derrick Stolee 2018-04-02 20:34 ` [PATCH v7 06/14] commit-graph: implement write_commit_graph() Derrick Stolee 2018-04-02 20:34 ` [PATCH v7 07/14] commit-graph: implement git-commit-graph write Derrick Stolee 2018-04-08 11:59 ` Jakub Narebski 2018-04-02 20:34 ` [PATCH v7 08/14] commit-graph: implement git commit-graph read Derrick Stolee 2018-04-02 21:33 ` Junio C Hamano 2018-04-03 11:49 ` Derrick Stolee 2018-04-08 12:59 ` Jakub Narebski 2018-04-02 20:34 ` [PATCH v7 09/14] commit-graph: add core.commitGraph setting Derrick Stolee 2018-04-08 13:39 ` Jakub Narebski 2018-04-02 20:34 ` [PATCH v7 10/14] commit-graph: close under reachability Derrick Stolee 2018-04-02 20:34 ` [PATCH v7 11/14] commit: integrate commit graph with commit parsing Derrick Stolee 2018-04-02 20:34 ` [PATCH v7 12/14] commit-graph: read only from specific pack-indexes Derrick Stolee 2018-04-02 20:34 ` [PATCH v7 13/14] commit-graph: build graph from starting commits Derrick Stolee 2018-04-08 13:50 ` Jakub Narebski 2018-04-02 20:34 ` [PATCH v7 14/14] commit-graph: implement "--additive" option Derrick Stolee 2018-04-05 8:27 ` SZEDER Gábor 2018-04-10 12:55 ` [PATCH v8 00/14] Serialized Git Commit Graph Derrick Stolee 2018-04-10 12:55 ` [PATCH v8 01/14] csum-file: rename hashclose() to finalize_hashfile() Derrick Stolee 2018-04-10 12:55 ` [PATCH v8 02/14] csum-file: refactor finalize_hashfile() method Derrick Stolee 2018-04-10 12:55 ` [PATCH v8 03/14] commit-graph: add format document Derrick Stolee 2018-04-10 19:10 ` Stefan Beller 2018-04-10 19:18 ` Derrick Stolee 2018-04-11 20:58 ` Jakub Narebski 2018-04-12 11:28 ` Derrick Stolee 2018-04-13 22:07 ` Jakub Narebski 2018-04-10 12:55 ` [PATCH v8 04/14] graph: add commit graph design document Derrick Stolee 2018-04-15 22:48 ` Jakub Narebski 2018-04-10 12:55 ` [PATCH v8 05/14] commit-graph: create git-commit-graph builtin Derrick Stolee 2018-04-10 12:56 ` [PATCH v8 06/14] commit-graph: implement write_commit_graph() Derrick Stolee 2018-04-10 12:56 ` [PATCH v8 07/14] commit-graph: implement git-commit-graph write Derrick Stolee 2018-04-10 12:56 ` [PATCH v8 08/14] commit-graph: implement git commit-graph read Derrick Stolee 2018-04-14 22:15 ` Jakub Narebski 2018-04-15 3:26 ` Eric Sunshine 2018-04-10 12:56 ` [PATCH v8 09/14] commit-graph: add core.commitGraph setting Derrick Stolee 2018-04-14 18:33 ` Jakub Narebski 2018-04-10 12:56 ` [PATCH v8 10/14] commit-graph: close under reachability Derrick Stolee 2018-04-10 12:56 ` [PATCH v8 11/14] commit: integrate commit graph with commit parsing Derrick Stolee 2018-04-10 12:56 ` [PATCH v8 12/14] commit-graph: read only from specific pack-indexes Derrick Stolee 2018-04-10 12:56 ` [PATCH v8 13/14] commit-graph: build graph from starting commits Derrick Stolee 2018-04-10 12:56 ` [PATCH v8 14/14] commit-graph: implement "--append" option Derrick Stolee
Reply instructions: You may reply publically to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=e9062408-0983-2e47-4338-4ab1823bb9bd@gmail.com \ --to=stolee@gmail.com \ --cc=dstolee@microsoft.com \ --cc=git@jeffhostetler.com \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=johannes.schindelin@gmx.de \ --cc=larsxschneider@gmail.com \ --cc=peff@peff.net \ --cc=ramsay@ramsayjones.plus.com \ --cc=sbeller@google.com \ --cc=szeder.dev@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
git@vger.kernel.org mailing list mirror (one of many) Archives are clonable: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.org/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ or Tor2web: https://www.tor2web.org/ AGPL code for this site: git clone https://public-inbox.org/ public-inbox