Skip to content

Commit 7412702

Browse files
committed
t5318: pass --bare to commit-graph helpers for bare repo tests
To prepare for `safe.bareRepository` defaulting to `explicit`, pass `--bare` at all bare-repo call sites in t5318 so the helpers use `--git-dir` instead of `-C`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 3a7f32a commit 7412702

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

t/t5318-commit-graph.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -274,17 +274,17 @@ test_expect_success 'setup bare repo' '
274274
git clone --bare --no-local full bare
275275
'
276276

277-
graph_git_behavior 'bare repo, commit 8 vs merge 1' bare commits/8 merge/1
278-
graph_git_behavior 'bare repo, commit 8 vs merge 2' bare commits/8 merge/2
277+
graph_git_behavior --bare 'bare repo, commit 8 vs merge 1' bare commits/8 merge/1
278+
graph_git_behavior --bare 'bare repo, commit 8 vs merge 2' bare commits/8 merge/2
279279

280280
test_expect_success 'write graph in bare repo' '
281281
git -C bare commit-graph write &&
282282
test_path_is_file bare/objects/info/commit-graph &&
283-
graph_read_expect -C bare 11 "generation_data extra_edges"
283+
graph_read_expect --bare -C bare 11 "generation_data extra_edges"
284284
'
285285

286-
graph_git_behavior 'bare repo with graph, commit 8 vs merge 1' bare commits/8 merge/1
287-
graph_git_behavior 'bare repo with graph, commit 8 vs merge 2' bare commits/8 merge/2
286+
graph_git_behavior --bare 'bare repo with graph, commit 8 vs merge 1' bare commits/8 merge/1
287+
graph_git_behavior --bare 'bare repo with graph, commit 8 vs merge 2' bare commits/8 merge/2
288288

289289
test_expect_success 'perform fast-forward merge in full repo' '
290290
git -C full checkout -b merge-5-to-8 commits/5 &&

0 commit comments

Comments
 (0)