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 <gits...@pobox.com>
Signed-off-by: Ramkumar Ramachandra <artag...@gmail.com>
---
 t/t4041-diff-submodule-option.sh |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh
index cfb71e5..103c690 100755
--- a/t/t4041-diff-submodule-option.sh
+++ b/t/t4041-diff-submodule-option.sh
@@ -11,18 +11,15 @@ 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
+       (cd "$1" &&
+           shift &&
+           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"
+           done >/dev/null &&
+           git rev-parse --short --verify HEAD)
 }
 commit_file () {
        test_tick &&
-- 
1.7.8.1.362.g5d6df.dirty

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to