summaryrefslogtreecommitdiff
path: root/t/t6430-merge-recursive.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2020-10-08 10:13:46 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-10-08 10:40:16 -0700
commita15ad5d1bc23f3a6842360df5ee840b1dc3e4888 (patch)
tree8f49dac72125bd0a36b23f576535e42bc8175c9a /t/t6430-merge-recursive.sh
parentGit 2.29-rc0 (diff)
downloadtgif-a15ad5d1bc23f3a6842360df5ee840b1dc3e4888.tar.xz
t1415: avoid using `main` as ref name
In preparation for a patch series that will change the fall-back for `init.defaultBranch` to `main`, let's not use `main` as ref name in this test script. Otherwise, the `git for-each-ref ... | grep main` which wants to catch those refs would also unexpectedly catch `refs/heads/main`. Since the refs in question are worktree-local ones (i.e. each worktree has their own, just like `HEAD`), and since the test case already uses a secondary worktree called "second", let's use the name "first" for those refs instead. While at it, adjust the test titles that talk about a "repo" when they meant a "worktree" instead. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6430-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions