t6026-merge-attr: clean up background process at end of test case

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 2eda134800b08e3dfcdc2084b221280b8d95e178..a8a4576342e519932be07fca5cbe2ee2fc0ab73b 100644 (file)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -163,9 +163,11 @@ git_pager() {
        else
                GIT_PAGER=cat
        fi
-       : ${LESS=-FRX}
-       : ${LV=-c}
-       export LESS LV
+       for vardef in @@PAGER_ENV@@
+       do
+               var=${vardef%%=*}
+               eval ": \"\${$vardef}\" && export $var"
+       done
 
        eval "$GIT_PAGER" '"$@"'
 }
@@ -375,7 +377,7 @@ git_dir_init () {
                gettextln "Unable to determine absolute path of git directory" >&2
                exit 1
        }
-       : ${GIT_OBJECT_DIRECTORY="$(git rev-parse --git-path objects)"}
+       : "${GIT_OBJECT_DIRECTORY="$(git rev-parse --git-path objects)"}"
 }
 
 if test -z "$NONGIT_OK"