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

[PATCH 2/5] t/lib-commit-graph.sh: avoid directory change in `graph_git_behavior()`

From
Taylor Blau <me@ttaylorr.com>
Date
Jul 21, 2023, 17:30 UTC
Message-ID
<715a160903be6dc8873a7215c55f90894e62f589.1689960606.git.me@ttaylorr.com>
In-Reply-To
<cover.1689960606.git.me@ttaylorr.com>

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 <me@ttaylorr.com>
---
 t/lib-commit-graph.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/t/lib-commit-graph.sh b/t/lib-commit-graph.sh
index c50553df0ed..c93969ae74d 100755
--- a/t/lib-commit-graph.sh
+++ b/t/lib-commit-graph.sh
@@ -20,12 +20,14 @@ graph_git_behavior() {
 	BRANCH=$3
 	COMPARE=$4
 	test_expect_success "check normal git operations: $MSG" '
-		cd "$TRASH_DIRECTORY/$DIR" &&
-		graph_git_two_modes "log --oneline $BRANCH" &&
-		graph_git_two_modes "log --topo-order $BRANCH" &&
-		graph_git_two_modes "log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "branch -vv" &&
-		graph_git_two_modes "merge-base -a $BRANCH $COMPARE"
+		(
+			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"
+		)
 	'
 }
 
-- 
2.41.0.381.gd8424d64777
Previous: Eric SunshineNext: Eric Sunshine
Message 9 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.