git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 1/4] t3033: avoid 'ambiguous refs' warning

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 21, 2016, 19:24 UTC
Message-ID
<20160421192500.23563-2-gitster@pobox.com>
In-Reply-To
<20160421192500.23563-1-gitster@pobox.com>

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>
---
 t/t3033-merge-toplevel.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t3033-merge-toplevel.sh b/t/t3033-merge-toplevel.sh
index c1379b0..d314599 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
 '
-- 
2.8.1-422-g6d9b748
Previous: Junio C HamanoNext: Junio C Hamano
Message 2 of 8 in “Loosening "two project merge" safety”
  1. 0/4 Loosening "two project merge" safetyJunio C Hamano, Apr 21, 2016
  2. 1/4 t3033: avoid 'ambiguous refs' warningJunio C Hamano, Apr 21, 2016
  3. 2/4 pull: pass --allow-unrelated-histories to "git merge"Junio C Hamano, Apr 21, 2016
  4. Stefan BellerApr 21, 2016
  5. Junio C HamanoApr 21, 2016
  6. 3/4 merge: GIT_MERGE_ALLOW_UNRELATED_HISTORIES environmentJunio C Hamano, Apr 21, 2016
  7. 4/4 merge: introduce merge.allowUnrelatedhistories configuration optionJunio C Hamano, Apr 21, 2016
  8. Junio C HamanoApr 21, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.