]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t/lib-commit-graph.sh: avoid sub-shell in `graph_git_behavior()`
authorTaylor Blau <me@ttaylorr.com>
Mon, 24 Jul 2023 16:39:34 +0000 (12:39 -0400)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Jul 2023 21:35:22 +0000 (14:35 -0700)
In a previous commit, we introduced a sub-shell in the implementation of
`graph_git_behavior()`, in order to allow us to pass `-C "$DIR"`
directly to the git processes spawned by `graph_git_two_modes()`.

Now that its callers are always operating from the "$TRASH_DIRECTORY"
instead of one of its sub-directories, we can drop the inner sub-shell,
as it is no longer required.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/lib-commit-graph.sh

index c8bd76a7777607d42c81f1ed2c92640b144eae96..89b26676fbb94b0b4f570ec9a51ca74cce7620c5 100755 (executable)
@@ -27,14 +27,11 @@ graph_git_behavior() {
        BRANCH=$3
        COMPARE=$4
        test_expect_success "check normal git operations: $MSG" '
-               (
-                       cd "$TRASH_DIRECTORY" &&
-                       graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-                       graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-                       graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-                       graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-                       graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-               )
+               graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+               graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+               graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+               graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+               graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
        '
 }