Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-21 21:52:33 +0300
committerJunio C Hamano <gitster@pobox.com>2016-04-21 21:52:33 +0300
commitde224962148c6b32ea2a6eba85578cc16d6c86c1 (patch)
tree3f425f1946f018079e57a4947d02af55ca319104 /t/t3033-merge-toplevel.sh
parente379fdf34fee96cd205be83ff4e71699bdc32b18 (diff)
t3033: avoid 'ambiguous refs' warning
Because "test_commit five" creates a commit and point it with a tag 'five', doing so on a branch whose name is 'five' will later result in an 'ambiguous refs' warning. Even though it is harmless because all the later references are for the tag, there is no reason for the branch to be called 'five'. Give it a name that describes its purpose more clearly, i.e. "newroot". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3033-merge-toplevel.sh')
-rwxr-xr-xt/t3033-merge-toplevel.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3033-merge-toplevel.sh b/t/t3033-merge-toplevel.sh
index c1379b00c2..d314599428 100755
--- a/t/t3033-merge-toplevel.sh
+++ b/t/t3033-merge-toplevel.sh
@@ -19,7 +19,7 @@ test_expect_success setup '
test_commit three &&
git checkout right &&
test_commit four &&
- git checkout --orphan five &&
+ git checkout --orphan newroot &&
test_commit five &&
git checkout master
'