Merge branch 'test-tool-git-dir'

Author: dscho

t/helper/test-tool.c

@@ -3,9 +3,10 @@
 #include "test-tool-utils.h"
 #include "trace2.h"
 #include "parse-options.h"
+#include "environment.h"
 
 static const char * const test_tool_usage[] = {
-	"test-tool [-C <directory>] <command [<arguments>...]]",
+	"test-tool [-C <directory>] [--git-dir=<path>] <command [<arguments>...]]",
 	NULL
 };
 
@@ -107,9 +108,12 @@ static NORETURN void die_usage(void)
 int cmd_main(int argc, const char **argv)
 {
 	const char *working_directory = NULL;
+	const char *git_dir = NULL;
 	struct option options[] = {
 		OPT_STRING('C', NULL, &working_directory, "directory",
 			   "change the working directory"),
+		OPT_STRING(0, "git-dir", &git_dir, "path",
+			   "set the path to the repository"),
 		OPT_END()
 	};
 
@@ -123,6 +127,8 @@ int cmd_main(int argc, const char **argv)
 
 	if (working_directory && chdir(working_directory) < 0)
 		die("Could not cd to '%s'", working_directory);
+	if (git_dir)
+		setenv(GIT_DIR_ENVIRONMENT, git_dir, 1);
 
 	for (size_t i = 0; i < ARRAY_SIZE(cmds); i++) {
 		if (!strcmp(cmds[i].name, argv[1])) {

t/t1460-refs-migrate.sh

@@ -8,24 +8,32 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 . ./test-lib.sh
 
 print_all_reflog_entries () {
-	repo=$1 &&
-	test-tool -C "$repo" ref-store main for-each-reflog >reflogs &&
+	repo_flag=$1 &&
+	repo=$2 &&
+	test-tool "$repo_flag" "$repo" ref-store main for-each-reflog >reflogs &&
 	while read reflog
 	do
 		echo "REFLOG: $reflog" &&
-		test-tool -C "$repo" ref-store main for-each-reflog-ent "$reflog" ||
+		test-tool "$repo_flag" "$repo" ref-store main for-each-reflog-ent "$reflog" ||
 		return 1
 	done <reflogs
 }
 
 # Migrate the provided repository from one format to the other and
 # verify that the references and logs are migrated over correctly.
-# Usage: test_migration <repo> <format> [<skip_reflog_verify> [<options...>]]
+# Usage: test_migration [--git-dir] <repo> <format> [<skip_reflog_verify> [<options...>]]
+#   --git-dir: treat <repo> as a git directory (for bare repositories).
 #   <repo> is the relative path to the repo to be migrated.
 #   <format> is the ref format to be migrated to.
 #   <skip_reflog_verify> (default: false) whether to skip reflog verification.
 #   <options...> are other options be passed directly to 'git refs migrate'.
 test_migration () {
+	repo_flag=-C &&
+	if test "$1" = "--git-dir"
+	then
+		repo_flag=--git-dir &&
+		shift
+	fi &&
 	repo=$1 &&
 	format=$2 &&
 	shift 2 &&
@@ -35,25 +43,25 @@ test_migration () {
 		skip_reflog_verify=$1
 		shift
 	fi &&
-	git -C "$repo" for-each-ref --include-root-refs \
+	git "$repo_flag" "$repo" for-each-ref --include-root-refs \
 		--format='%(refname) %(objectname) %(symref)' >expect &&
 	if ! $skip_reflog_verify
 	then
-		print_all_reflog_entries "$repo" >expect_logs
+		print_all_reflog_entries "$repo_flag" "$repo" >expect_logs
 	fi &&
 
-	git -C "$repo" refs migrate --ref-format="$format" "$@" &&
+	git "$repo_flag" "$repo" refs migrate --ref-format="$format" "$@" &&
 
-	git -C "$repo" for-each-ref --include-root-refs \
+	git "$repo_flag" "$repo" for-each-ref --include-root-refs \
 		--format='%(refname) %(objectname) %(symref)' >actual &&
 	test_cmp expect actual &&
 	if ! $skip_reflog_verify
 	then
-		print_all_reflog_entries "$repo" >actual_logs &&
+		print_all_reflog_entries "$repo_flag" "$repo" >actual_logs &&
 		test_cmp expect_logs actual_logs
 	fi &&
 
-	git -C "$repo" rev-parse --show-ref-format >actual &&
+	git "$repo_flag" "$repo" rev-parse --show-ref-format >actual &&
 	echo "$format" >expect &&
 	test_cmp expect actual
 }
@@ -144,7 +152,7 @@ do
 			git init --ref-format=$from_format repo &&
 			test_commit -C repo initial &&
 			git clone --ref-format=$from_format --mirror repo repo.git &&
-			test_migration repo.git "$to_format"
+			test_migration --git-dir repo.git "$to_format"
 		'
 
 		test_expect_success "$from_format -> $to_format: dangling symref" '