Merge branch 'lib-commit-graph-bare'

Author: dscho

t/lib-commit-graph.sh

@@ -22,23 +22,41 @@ graph_git_two_modes() {
 # NOTE: it is a bug to call this function with <directory> containing
 # any characters in $IFS.
 graph_git_behavior() {
+	BARE=
+	if test "$1" = "--bare"
+	then
+		BARE=t
+		shift
+	fi
 	MSG=$1
 	DIR=$2
 	BRANCH=$3
 	COMPARE=$4
 	test_expect_success "check normal git operations: $MSG" '
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+		if test -n "$BARE"
+		then
+			DIR_ARGS="${DIR:+--git-dir=$DIR}"
+		else
+			DIR_ARGS="${DIR:+-C $DIR}"
+		fi &&
+		graph_git_two_modes "$DIR_ARGS log --oneline $BRANCH" &&
+		graph_git_two_modes "$DIR_ARGS log --topo-order $BRANCH" &&
+		graph_git_two_modes "$DIR_ARGS log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "$DIR_ARGS branch -vv" &&
+		graph_git_two_modes "$DIR_ARGS merge-base -a $BRANCH $COMPARE"
 	'
 }
 
 graph_read_expect() {
 	OPTIONAL=""
 	NUM_CHUNKS=3
 	DIR="."
+	BARE=
+	if test "$1" = "--bare"
+	then
+		BARE=t
+		shift
+	fi
 	if test "$1" = -C
 	then
 		shift
@@ -68,6 +86,10 @@ graph_read_expect() {
 	EOF
 	(
 		cd "$DIR" &&
+		if test -n "$BARE"
+		then
+			GIT_DIR=. && export GIT_DIR
+		fi &&
 		test-tool read-graph >output &&
 		test_cmp expect output
 	)

t/t5318-commit-graph.sh

@@ -274,17 +274,17 @@ test_expect_success 'setup bare repo' '
 	git clone --bare --no-local full bare
 '
 
-graph_git_behavior 'bare repo, commit 8 vs merge 1' bare commits/8 merge/1
-graph_git_behavior 'bare repo, commit 8 vs merge 2' bare commits/8 merge/2
+graph_git_behavior --bare 'bare repo, commit 8 vs merge 1' bare commits/8 merge/1
+graph_git_behavior --bare 'bare repo, commit 8 vs merge 2' bare commits/8 merge/2
 
 test_expect_success 'write graph in bare repo' '
 	git -C bare commit-graph write &&
 	test_path_is_file bare/objects/info/commit-graph &&
-	graph_read_expect -C bare 11 "generation_data extra_edges"
+	graph_read_expect --bare -C bare 11 "generation_data extra_edges"
 '
 
-graph_git_behavior 'bare repo with graph, commit 8 vs merge 1' bare commits/8 merge/1
-graph_git_behavior 'bare repo with graph, commit 8 vs merge 2' bare commits/8 merge/2
+graph_git_behavior --bare 'bare repo with graph, commit 8 vs merge 1' bare commits/8 merge/1
+graph_git_behavior --bare 'bare repo with graph, commit 8 vs merge 2' bare commits/8 merge/2
 
 test_expect_success 'perform fast-forward merge in full repo' '
 	git -C full checkout -b merge-5-to-8 commits/5 &&