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

[PATCH 1/5] t3200: test --set-upstream-to with bogus refs

From
Jeff King <peff@peff.net>
Date
Apr 2, 2013, 19:02 UTC
Message-ID
<20130402190252.GA32316@sigill.intra.peff.net>
In-Reply-To
<20130402190134.GA17784@sigill.intra.peff.net>

These tests pass with the current code, but let's make sure we don't accidentally break the behavior in the future.

Note that our tests expect failure when we try to set the upstream to or from a missing branch. Technically we are just munging config here, so we do not need the refs to exist. But seeing that they do exist is a good check that the user has not made a typo.

Signed-off-by: Jeff King <peff@peff.net>
---
 t/t3200-branch.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index b08c9f2..09f65f8 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -409,6 +409,18 @@ test_expect_success '--set-upstream-to fails on detached HEAD' '
 	git checkout -
 '
 
+test_expect_success '--set-upstream-to fails on a missing dst branch' '
+	test_must_fail git branch --set-upstream-to master does-not-exist
+'
+
+test_expect_success '--set-upstream-to fails on a missing src branch' '
+	test_must_fail git branch --set-upstream-to does-not-exist master
+'
+
+test_expect_success '--set-upstream-to fails on a non-ref' '
+	test_must_fail git branch --set-upstream-to HEAD^{}
+'
+
 test_expect_success 'use --set-upstream-to modify HEAD' '
 	test_config branch.master.remote foo &&
 	test_config branch.master.merge foo &&
-- 
1.8.2.rc0.33.gd915649
Previous: Jeff KingNext: Jeff King
Message 6 of 15 in “[BUG] inconsistent behavior with --set-upstream vs --set-upstream-to”
  1. Garrett CooperApr 2, 2013
  2. Jeff KingApr 2, 2013
  3. Garrett CooperApr 2, 2013
  4. Jeff KingApr 2, 2013
  5. 0/5 branch --set-upstream-to error-message improvementsJeff King, Apr 2, 2013
  6. 1/5 t3200: test --set-upstream-to with bogus refsJeff King, Apr 2, 2013
  7. 2/5 branch: factor out "upstream is not a branch" error messagesJeff King, Apr 2, 2013
  8. Garrett CooperApr 2, 2013
  9. Garrett CooperApr 2, 2013
  10. 3/5 branch: improve error message for missing --set-upstream-to refJeff King, Apr 2, 2013
  11. 4/5 branch: mention start_name in set-upstream error messagesJeff King, Apr 2, 2013
  12. Garrett CooperApr 2, 2013
  13. 5/5 branch: give advice when tracking start-point is missingJeff King, Apr 2, 2013
  14. Junio C HamanoApr 2, 2013
  15. Jonathan NiederApr 2, 2013

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.