Merge branch 'pw/rebase-skip-commit-message-fix'

[thirdparty/git.git] / t / test-lib-functions.sh

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index d8a52334eebc162187593acc78b97694dcb69538..2f8868caa171d2d3ce78f3672e937ab7f8a3db97 100644 (file)
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -542,8 +542,17 @@ test_config () {
                config_dir=$1
                shift
        fi
-       test_when_finished "test_unconfig ${config_dir:+-C '$config_dir'} '$1'" &&
-       git ${config_dir:+-C "$config_dir"} config "$@"
+
+       # If --worktree is provided, use it to configure/unconfigure
+       is_worktree=
+       if test "$1" = --worktree
+       then
+               is_worktree=1
+               shift
+       fi
+
+       test_when_finished "test_unconfig ${config_dir:+-C '$config_dir'} ${is_worktree:+--worktree} '$1'" &&
+       git ${config_dir:+-C "$config_dir"} config ${is_worktree:+--worktree} "$@"
 }
 
 test_config_global () {
@@ -901,6 +910,15 @@ test_path_is_symlink () {
        fi
 }
 
+test_path_is_executable () {
+       test "$#" -ne 1 && BUG "1 param"
+       if ! test -x "$1"
+       then
+               echo "$1 is not executable"
+               false
+       fi
+}
+
 # Check if the directory exists and is empty as expected, barf otherwise.
 test_dir_is_empty () {
        test "$#" -ne 1 && BUG "1 param"