git/t/t5318-commit-graph.sh, branch v2.20.2

Merge branch 'md/test-cleanup'

2018-10-16T07:16:01Z

Various test scripts have been updated for style and also correct handling of exit status of various commands. * md/test-cleanup: tests: order arguments to git-rev-list properly t9109: don't swallow Git errors upstream of pipes tests: don't swallow Git errors upstream of pipes t/*: fix ordering of expected/observed arguments tests: standardize pipe placement Documentation: add shell guidelines t/README: reformat Do, Don't, Keep in mind lists

Merge branch 'ds/commit-graph-with-grafts'

2018-10-16T07:15:59Z

The recently introduced commit-graph auxiliary data is incompatible with mechanisms such as replace & grafts that "breaks" immutable nature of the object reference relationship. Disable optimizations based on its use (and updating existing commit-graph) when these incompatible features are in use in the repository. * ds/commit-graph-with-grafts: commit-graph: close_commit_graph before shallow walk commit-graph: not compatible with uninitialized repo commit-graph: not compatible with grafts commit-graph: not compatible with replace objects test-repository: properly init repo commit-graph: update design document refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback refs.c: migrate internal ref iteration to pass thru repository argument

t/*: fix ordering of expected/observed arguments

2018-10-06T23:51:18Z

Fix various places where the ordering was obviously wrong, meaning it was easy to find with grep. Signed-off-by: Matthew DeVore Signed-off-by: Junio C Hamano

t5318: use test_oid for HASH_LEN

2018-09-17T15:10:32Z

Signed-off-by: Derrick Stolee Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

tests: fix and add lint for non-portable grep --file

2018-08-27T21:07:32Z

The --file option to grep isn't in POSIX[1], but -f is[1]. Let's check for that in the future, and fix the portability regression in f237c8b6fe ("commit-graph: implement git-commit-graph write", 2018-04-02) that broke e.g. AIX. 1. http://pubs.opengroup.org/onlinepubs/009695399/utilities/grep.html Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

commit-graph: not compatible with grafts

2018-08-21T17:22:51Z

Augment commit_graph_compatible(r) to return false when the given repository r has commit grafts or is a shallow clone. Test that in these situations we ignore existing commit-graph files and we do not write new commit-graph files. Helped-by: Jakub Narebski Signed-off-by: Derrick Stolee Signed-off-by: Junio C Hamano

commit-graph: not compatible with replace objects

2018-08-21T17:22:51Z

Create new method commit_graph_compatible(r) to check if a given repository r is compatible with the commit-graph feature. Fill the method with a check to see if replace-objects exist. Test this interaction succeeds, including ignoring an existing commit-graph and failing to write a new commit-graph. However, we do ensure that we write a new commit-graph by setting read_replace_refs to 0, thereby ignoring the replace refs. Signed-off-by: Derrick Stolee Signed-off-by: Junio C Hamano

Merge branch 'jt/commit-graph-per-object-store'

2018-08-20T18:33:51Z

Test update. * jt/commit-graph-per-object-store: t5318: avoid unnecessary command substitutions

Merge branch 'ds/commit-graph-fsck'

2018-08-20T18:33:51Z

Test fix. * ds/commit-graph-fsck: t5318: use 'test_cmp_bin' to compare commit-graph files

t5318: avoid unnecessary command substitutions

2018-08-13T19:09:02Z

Two tests added in dade47c06c (commit-graph: add repo arg to graph readers, 2018-07-11) prepare the contents of 'expect' files by 'echo'ing the results of command substitutions. That's unncessary, avoid them by directly saving the output of the commands executed in those command substitutions. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano