admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

t/lib-commit-graph.sh: avoid sub-shell in graph_git_behavior()

Browse Source 
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>
This commit is contained in:
Taylor Blau
2023-07-24 12:39:34 -04:00
committed by Junio C Hamano
parent 749f126b29
commit f1b9cebc8b
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
t/lib-commit-graph.sh
View File

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