From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: Derrick Stolee <derrickstolee@github.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 5/5] t/lib-commit-graph.sh: avoid sub-shell in `graph_git_behavior()`
Date: Fri, 21 Jul 2023 13:30:23 -0400 [thread overview]
Message-ID: <c3432f27b94bbd72d3e721bfede94d158acd20ae.1689960606.git.me@ttaylorr.com> (raw)
In-Reply-To: <cover.1689960606.git.me@ttaylorr.com>
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>
---
t/lib-commit-graph.sh | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/t/lib-commit-graph.sh b/t/lib-commit-graph.sh
index c93969ae74d..b7b52b4291b 100755
--- a/t/lib-commit-graph.sh
+++ b/t/lib-commit-graph.sh
@@ -20,14 +20,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"
'
}
--
2.41.0.381.gd8424d64777
next prev parent reply other threads:[~2023-07-21 17:31 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-21 17:30 [PATCH 0/5] commit-graph: test cleanup and modernization Taylor Blau
2023-07-21 17:30 ` [PATCH 1/5] t/lib-commit-graph.sh: allow `graph_read_expect()` in sub-directories Taylor Blau
2023-07-21 17:41 ` Eric Sunshine
2023-07-21 18:33 ` Taylor Blau
2023-07-21 18:54 ` Junio C Hamano
2023-07-21 17:30 ` [PATCH 2/5] t/lib-commit-graph.sh: avoid directory change in `graph_git_behavior()` Taylor Blau
2023-07-21 18:01 ` Eric Sunshine
2023-07-21 18:39 ` Taylor Blau
2023-07-21 19:02 ` Junio C Hamano
2023-07-21 17:30 ` [PATCH 3/5] t5318: avoid top-level directory changes Taylor Blau
2023-07-21 18:28 ` Eric Sunshine
2023-07-21 17:30 ` [PATCH 4/5] t5328: " Taylor Blau
2023-07-21 17:30 ` Taylor Blau [this message]
2023-07-21 18:34 ` [PATCH 0/5] commit-graph: test cleanup and modernization Eric Sunshine
2023-07-21 22:35 ` Junio C Hamano
2023-07-24 16:39 ` [PATCH v2 " Taylor Blau
2023-07-24 16:39 ` [PATCH v2 1/5] t/lib-commit-graph.sh: allow `graph_read_expect()` in sub-directories Taylor Blau
2023-07-24 16:39 ` [PATCH v2 2/5] t/lib-commit-graph.sh: avoid directory change in `graph_git_behavior()` Taylor Blau
2023-07-24 16:39 ` [PATCH v2 3/5] t5318: avoid top-level directory changes Taylor Blau
2023-07-24 21:48 ` Junio C Hamano
2023-07-24 16:39 ` [PATCH v2 4/5] t5328: " Taylor Blau
2023-07-24 16:39 ` [PATCH v2 5/5] t/lib-commit-graph.sh: avoid sub-shell in `graph_git_behavior()` Taylor Blau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c3432f27b94bbd72d3e721bfede94d158acd20ae.1689960606.git.me@ttaylorr.com \
--to=me@ttaylorr.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).