summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gummerer <t.gummerer@gmail.com>2018-03-25 14:49:47 +0100
committerJunio C Hamano <gitster@pobox.com>2018-03-27 15:38:26 -0700
commitaaee0c044b3946930edd1c98f9c1d7fc432227d4 (patch)
treeb40d2ff8ab040777cea55be99fdd1ee9cf2f259c
parent0fb8bea22fe7da875ab0809ebf72c3c9664cc338 (diff)
downloadgit-tg/worktree-add-existing-branch.tar.gz
t2025: rename now outdated branch nametg/worktree-add-existing-branch
Before the previous commit, the branch named precious was used to check that 'git worktree' wouldn't clobber the branch. While 'git worktree' still shouldn't (and doesn't) modify the branch, that's no longer the main thing the test is checking. Rename the branch to avoid making future readers wonder why this particular branch is more "precious" than others. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t2025-worktree-add.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh
index ae602cf20e..fb99f4c46f 100755
--- a/t/t2025-worktree-add.sh
+++ b/t/t2025-worktree-add.sh
@@ -201,12 +201,12 @@ test_expect_success '"add" with <branch> omitted' '
test_expect_success '"add" checks out existing branch of dwimd name' '
test_commit c1 &&
test_commit c2 &&
- git branch precious HEAD~1 &&
- git worktree add precious &&
- test_cmp_rev HEAD~1 precious &&
+ git branch dwim HEAD~1 &&
+ git worktree add dwim &&
+ test_cmp_rev HEAD~1 dwim &&
(
- cd precious &&
- test_cmp_rev precious HEAD
+ cd dwim &&
+ test_cmp_rev dwim HEAD
)
'