t/lib-commit-graph.sh: avoid directory change in `graph_git_behavior()`

The `graph_git_behavior()` helper asserts that a number of common Git operations (such as `git log --oneline`, `git log --topo-order`, etc.) produce identical output regardless of whether or not a commit-graph is in use. This helper takes as its second argument the location (relative to the `$TRASH_DIRECTORY`) of the Git repostiory under test. In order to run each of its commands within that repository, it first changes into that directory, without the use of a sub-shell. This pollutes future tests which expect to be run in the top-level `$TRASH_DIRECTORY` as usual. We could wrap `graph_git_behavior()` in a sub-shell, like: graph_git_behavior() { # ... ( cd "$TRASH_DIRECTORY/$DIR" && graph_git_two_modesl ) } , but since we're invoking git directly, we can pass along a "-C $DIR" when "$DIR" is non-empty. Note, however, that until the remaining callers are cleaned up to avoid changing working directories outside of a sub-shell, that we need to ensure that we are operating in the top-level $TRASH_DIRECTORY. The inner-subshell will go away in a future commit once it is no longer necessary. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Taylor Blau committed Jul 24, 2023 at 12:39 UTC a953d2b628952f8d225d337deb1c30e20f835689
1 file changed +15 -6
t/lib-commit-graph.sh
+15 -6
@@ -14,18 +14,27 @@ graph_git_two_modes() {
14 test_cmp expect output
15 }
16
17 +# graph_git_behavior <name> <directory> <branch> <compare>
18 +#
19 +# Ensures that a handful of traversal operations produce the same
20 +# results with and without the commit-graph in use.
21 +#
22 +# NOTE: it is a bug to call this function with <directory> containing
23 +# any characters in $IFS.
24 graph_git_behavior() {
25 MSG=$1
26 DIR=$2
27 BRANCH=$3
28 COMPARE=$4
29 test_expect_success "check normal git operations: $MSG" '
23 - cd "$TRASH_DIRECTORY/$DIR" &&
24 - graph_git_two_modes "log --oneline $BRANCH" &&
25 - graph_git_two_modes "log --topo-order $BRANCH" &&
26 - graph_git_two_modes "log --graph $COMPARE..$BRANCH" &&
27 - graph_git_two_modes "branch -vv" &&
28 - graph_git_two_modes "merge-base -a $BRANCH $COMPARE"
30 + (
31 + cd "$TRASH_DIRECTORY" &&
32 + graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
33 + graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
34 + graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
35 + graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
36 + graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
37 + )
38 '
39 }
40