[PATCH] test GIT_WORK_DIR

@@ -0,0 +1,91 @@
+#!/bin/sh
+
+test_description='test GIT_WORK_DIR'
+. ./test-lib.sh
+
+export GIT_DIR=$(pwd)/repository
+export GIT_CONFIG="$GIT_DIR/config"
+top=$(pwd) || exit 1
+mv .git "$GIT_DIR" || exit 1
+mkdir -p working/directory || exit 1
+
+# test setup code and precedence of core.workdir, GIT_WORK_DIR and --work-dir
+test_expect_failure 'GIT_WORK_DIR=non-existent' \
+	'env GIT_WORK_DIR=non-existent git rev-parse'
+test_expect_success 'GIT_WORK_DIR=working/directory' \
+	'env GIT_WORK_DIR=working/directory git rev-parse'
+test_expect_success 'GIT_WORK_DIR=`pwd`/working/directory' \
+	'env GIT_WORK_DIR="$(pwd)"/working/directory git rev-parse'
+
+test_expect_success '--work-dir' \
+	'git --work-dir working/directory rev-parse'
+test_expect_success '--work-dir overrides GIT_WORK_DIR' \
+	'env GIT_WORK_DIR=non-existent git --work-dir working/directory rev-parse'
+
+test_expect_success 'core.workdir = non-existent' \
+	'git config core.workdir non-existent'
+test_expect_failure 'core.workdir' \
+	'git rev-parse'
+test_expect_success 'GIT_WORK_DIR overrides core.workdir' \
+	'env GIT_WORK_DIR=working/directory git rev-parse'
+test_expect_success '--work-dir overrides core.workdir' \
+	'git --work-dir working/directory rev-parse'
+
+test_expect_success 'core.workdir = `pwd`/working/directory' \
+	'git --work-dir . config core.workdir "$(pwd)"/working/directory'
+test_expect_success 'core.workdir' \
+	'git rev-parse'
+test_expect_success 'core.workdir = ../working/directory' \
+	'git --work-dir . config core.workdir ../working/directory'
+test_expect_success 'core.workdir' \
+	'git rev-parse'
+
+# outside of working directory
+test_expect_success 'outside: --is-bare-repository' \
+	'test "true" = "$(git rev-parse --is-bare-repository)"'
+
+# in toplevel working directory
+cd working/directory || exit 1
+test_expect_success 'inside: --is-bare-repository' \
+	'test "false" = "$(git rev-parse --is-bare-repository)"'
+test_expect_success 'inside: --is-inside-git-dir' \
+	'test "false" = "$(git rev-parse --is-inside-git-dir)"'
+test_expect_success 'inside: --show-prefix' \
+	'test "" = "$(git rev-parse --show-prefix)"'
+test_expect_success 'inside: --show-cdup' \
+	'test "" = "$(git rev-parse --show-cdup)"'
+
+# in subdirectory
+mkdir -p a/b || exit 1
+cd a/b || exit 1
+test_expect_success 'subdirectory: --is-bare-repository' \
+	'test "false" = "$(git rev-parse --is-bare-repository)"'
+test_expect_success 'subdirectory: --is-inside-git-dir' \
+	'test "false" = "$(git rev-parse --is-inside-git-dir)"'
+test_expect_success 'subdirectory: --show-prefix' \
+	'test "a/b/" = "$(git rev-parse --show-prefix)"'
+test_expect_success 'subdirectory: --show-cdup' \
+	'test "../../" = "$(git rev-parse --show-cdup)"'
+
+# in repository directory
+cd "$top/repository" || exit 1
+test_expect_success 'repository: --is-bare-repository' \
+	'test "true" = "$(git rev-parse --is-bare-repository)"'
+test_expect_success 'repository: --is-inside-git-dir' \
+	'test "true" = "$(git rev-parse --is-inside-git-dir)"'
+cd objects || exit 1
+test_expect_success 'repository/objects: --is-inside-git-dir' \
+	'test "true" = "$(git rev-parse --is-inside-git-dir)"'
+cd .. || exit 1
+
+# workdir is subdirectory of repository
+mkdir workdir || exit 1
+cd workdir || exit 1
+test_expect_success 'core.workdir = workdir' \
+	'git config core.workdir workdir'
+test_expect_success 'repository/workdir: --is-bare-repository' \
+	'test "false" = "$(git rev-parse --is-bare-repository)"'
+test_expect_success 'repository/workdir: --is-inside-git-dir' \
+	'test "false" = "$(git rev-parse --is-inside-git-dir)"'
+
+test_done

@@ -25,6 +25,7 @@ GIT_COMMITTER_EMAIL=committer@example.com
 GIT_COMMITTER_NAME='C O Mitter'
 unset GIT_DIFF_OPTS
 unset GIT_DIR
+unset GIT_WORK_DIR
 unset GIT_EXTERNAL_DIFF
 unset GIT_INDEX_FILE
 unset GIT_OBJECT_DIRECTORY