Skip to content

Commit a953d2b

Browse files
ttaylorrgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c355b64 commit a953d2b

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

t/lib-commit-graph.sh

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,27 @@ graph_git_two_modes() {
1414
test_cmp expect output
1515
}
1616

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.
1724
graph_git_behavior() {
1825
MSG=$1
1926
DIR=$2
2027
BRANCH=$3
2128
COMPARE=$4
2229
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+
)
2938
'
3039
}
3140

0 commit comments

Comments
 (0)