git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 5/5] t/lib-commit-graph.sh: avoid sub-shell in `graph_git_behavior()`

From
Taylor Blau <me@ttaylorr.com>
Date
Jul 24, 2023, 16:39 UTC
Message-ID
<887006eab461908493d377c042dd1b7e74641170.1690216758.git.me@ttaylorr.com>
In-Reply-To
<cover.1690216758.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 c8bd76a7777..89b26676fbb 100755
--- a/t/lib-commit-graph.sh
+++ b/t/lib-commit-graph.sh
@@ -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"
 	'
 }
 
-- 
2.41.0.399.g887006eab46
Previous: Junio C HamanoNext: Taylor Blau
Message 21 of 22 in “commit-graph: test cleanup and modernization”
  1. 0/5 commit-graph: test cleanup and modernizationTaylor Blau, Jul 21, 2023
  2. 1/5 t/lib-commit-graph.sh: allow `graph_read_expect()` in sub-directoriesTaylor Blau, Jul 21, 2023
  3. Eric SunshineJul 21, 2023
  4. Taylor BlauJul 21, 2023
  5. Junio C HamanoJul 21, 2023
  6. 4/5 t5328: avoid top-level directory changesTaylor Blau, Jul 21, 2023
  7. 3/5 t5318: avoid top-level directory changesTaylor Blau, Jul 21, 2023
  8. Eric SunshineJul 21, 2023
  9. 2/5 t/lib-commit-graph.sh: avoid directory change in `graph_git_behavior()`Taylor Blau, Jul 21, 2023
  10. Eric SunshineJul 21, 2023
  11. Taylor BlauJul 21, 2023
  12. Junio C HamanoJul 21, 2023
  13. 5/5 t/lib-commit-graph.sh: avoid sub-shell in `graph_git_behavior()`Taylor Blau, Jul 21, 2023
  14. Eric SunshineJul 21, 2023
  15. Junio C HamanoJul 21, 2023
  16. 0/5 commit-graph: test cleanup and modernizationTaylor Blau, Jul 24, 2023
  17. 1/5 t/lib-commit-graph.sh: allow `graph_read_expect()` in sub-directoriesTaylor Blau, Jul 24, 2023
  18. 2/5 t/lib-commit-graph.sh: avoid directory change in `graph_git_behavior()`Taylor Blau, Jul 24, 2023
  19. 3/5 t5318: avoid top-level directory changesTaylor Blau, Jul 24, 2023
  20. Junio C HamanoJul 24, 2023
  21. 5/5 t/lib-commit-graph.sh: avoid sub-shell in `graph_git_behavior()`Taylor Blau, Jul 24, 2023
  22. 4/5 t5328: avoid top-level directory changesTaylor Blau, Jul 24, 2023

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.