diff.c: convert -U|--unified

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 4459bdda13eeff5b579762cd0e45e882c7a94b6c..92cf8f812cca26c94c8054ccd40af806f6b77310 100644 (file)
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -1288,8 +1288,6 @@ test_set_port () {
                        # root-only port, use a larger one instead.
                        port=$(($port + 10000))
                fi
-
-               eval $var=$port
                ;;
        *[^0-9]*|0*)
                error >&7 "invalid port number: $port"
@@ -1298,4 +1296,9 @@ test_set_port () {
                # The user has specified the port.
                ;;
        esac
+
+       # Make sure that parallel '--stress' test jobs get different
+       # ports.
+       port=$(($port + ${GIT_TEST_STRESS_JOB_NR:-0}))
+       eval $var=$port
 }