Derrick Stolee <stolee@xxxxxxxxx> writes: > This v6 includes feedback around csum-file.c and the rename of hashclose() > to finalize_hashfile(). These are the first two commits of the series, so > they could be pulled out independently. > > The only other change since v5 is that I re-ran the performance numbers > in "commit: integrate commit graph with commit parsing". Thanks. > 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. 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. + warning: 1 line adds whitespace errors. Applying: commit-graph: add format document .git/rebase-apply/patch:175: new blank line at EOF. + warning: 1 line adds whitespace errors. Applying: graph: add commit graph design document .git/rebase-apply/patch:42: new blank line at EOF. + .git/rebase-apply/patch:109: new blank line at EOF. + warning: 2 lines add whitespace errors. Applying: commit-graph: create git-commit-graph builtin .git/rebase-apply/patch:323: space before tab in indent. fd = hold_lock_file_for_update(&lk, graph_name, 0); .git/rebase-apply/patch:334: space before tab in indent. fd = hold_lock_file_for_update(&lk, graph_name, LOCK_DIE_ON_ERROR); .git/rebase-apply/patch:385: new blank line at EOF. + .git/rebase-apply/patch:398: new blank line at EOF. + warning: 2 lines applied after fixing whitespace errors. Applying: commit-graph: implement write_commit_graph() .git/rebase-apply/patch:138: indent with spaces. cd "$TRASH_DIRECTORY/full" && .git/rebase-apply/patch:144: indent with spaces. cd "$TRASH_DIRECTORY/full" && .git/rebase-apply/patch:154: indent with spaces. cd "$TRASH_DIRECTORY/full" && .git/rebase-apply/patch:160: indent with spaces. cd "$TRASH_DIRECTORY/full" && .git/rebase-apply/patch:197: indent with spaces. cd "$TRASH_DIRECTORY/full" && warning: squelched 6 whitespace errors warning: 10 lines applied after fixing whitespace errors. Applying: commit-graph: implement 'git-commit-graph write' Test number t5318 already taken .git/rebase-apply/patch:346: indent with spaces. cd "$TRASH_DIRECTORY/full" && .git/rebase-apply/patch:356: indent with spaces. cd "$TRASH_DIRECTORY/full" && .git/rebase-apply/patch:366: indent with spaces. cd "$TRASH_DIRECTORY/full" && .git/rebase-apply/patch:374: indent with spaces. cd "$TRASH_DIRECTORY/full" && .git/rebase-apply/patch:384: indent with spaces. cd "$TRASH_DIRECTORY/bare" && warning: 5 lines add whitespace errors. Applying: commit-graph: implement git commit-graph read Applying: commit-graph: add core.commitGraph setting Applying: commit-graph: close under reachability .git/rebase-apply/patch:302: indent with spaces. cd "$TRASH_DIRECTORY/full" && .git/rebase-apply/patch:310: indent with spaces. cd "$TRASH_DIRECTORY/full" && .git/rebase-apply/patch:321: indent with spaces. cd "$TRASH_DIRECTORY/full" && .git/rebase-apply/patch:331: indent with spaces. cd "$TRASH_DIRECTORY/full" && .git/rebase-apply/patch:341: indent with spaces. cd "$TRASH_DIRECTORY/full" && warning: squelched 2 whitespace errors warning: 7 lines add whitespace errors. Applying: commit: integrate commit graph with commit parsing .git/rebase-apply/patch:224: indent with spaces. cd "$TRASH_DIRECTORY/full" && .git/rebase-apply/patch:227: trailing whitespace. graph_read_expect "9" "large_edges" .git/rebase-apply/patch:234: indent with spaces. cd "$TRASH_DIRECTORY" && warning: 2 lines applied after fixing whitespace errors. Applying: commit-graph: read only from specific pack-indexes .git/rebase-apply/patch:196: indent with spaces. cd "$TRASH_DIRECTORY/full" && .git/rebase-apply/patch:209: indent with spaces. cd "$TRASH_DIRECTORY" && warning: 1 line applied after fixing whitespace errors. Applying: commit-graph: build graph from starting commits .git/rebase-apply/patch:148: indent with spaces. cd "$TRASH_DIRECTORY/full" && .git/rebase-apply/patch:158: indent with spaces. cd "$TRASH_DIRECTORY" && warning: 1 line applied after fixing whitespace errors. Applying: commit-graph: implement "--additive" option