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

[PATCH v2 3/4] t4041 (diff-submodule-option): rewrite add_file() routine

From
Ramkumar Ramachandra <artagnon@gmail.com>
Date
Nov 30, 2012, 11:37 UTC
Message-ID
<1354275456-11104-4-git-send-email-artagnon@gmail.com>
In-Reply-To
<1354275456-11104-1-git-send-email-artagnon@gmail.com>

Instead of "cd there and then come back", use the "cd there in a subshell" pattern. Also fix '&&' chaining in one place.

Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 t/t4041-diff-submodule-option.sh |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh
index 08d549a..d745197 100755
--- a/t/t4041-diff-submodule-option.sh
+++ b/t/t4041-diff-submodule-option.sh
@@ -11,18 +11,17 @@ This test tries to verify the sanity of the --submodule option of git diff.
 . ./test-lib.sh
 
 add_file () {
-	sm=$1
-	shift
-	owd=$(pwd)
-	cd "$sm"
-	for name; do
-		echo "$name" > "$name" &&
-		git add "$name" &&
-		test_tick &&
-		git commit -m "Add $name"
-	done >/dev/null
-	git rev-parse --short --verify HEAD
-	cd "$owd"
+	(
+		cd "$1" &&
+		shift &&
+		for name; do
+			echo "$name" > "$name" &&
+			git add "$name" &&
+			test_tick &&
+			git commit -m "Add $name" || exit
+		done >/dev/null &&
+		git rev-parse --short --verify HEAD
+	)
 }
 commit_file () {
 	test_tick &&
-- 
1.7.8.1.362.g5d6df.dirty
Previous: Ramkumar RamachandraNext: Ramkumar Ramachandra
Message 4 of 5 in “t4041 (diff-submodule-option): minor cleanup”
  1. 0/4 t4041 (diff-submodule-option): minor cleanupRamkumar Ramachandra, Nov 30, 2012
  2. 1/4 t4041 (diff-submodule-option): don't hardcode SHA-1 in expected outputsRamkumar Ramachandra, Nov 30, 2012
  3. 2/4 t4041 (diff-submodule-option): parse digests sensiblyRamkumar Ramachandra, Nov 30, 2012
  4. 3/4 t4041 (diff-submodule-option): rewrite add_file() routineRamkumar Ramachandra, Nov 30, 2012
  5. 4/4 t4041 (diff-submodule-option): modernize styleRamkumar Ramachandra, Nov 30, 2012

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.