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

[PATCH] t3200-branch.sh: use "--set-upstream-to" in test

From
Robert P. J. Day <rpjday@crashcourse.ca>
Date
Jun 5, 2018, 11:14 UTC
Message-ID
<alpine.LFD.2.21.1806050712270.10467@localhost.localdomain>

Change deprecated "--set-upstream" branch option to preferred "--set-upstream-to".

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
---
  i'm assuming this should use "--set-upstream-to" as do all the
others.
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 69ea8202f4..ef887a0b32 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -885,8 +885,8 @@ test_expect_success 'test --unset-upstream on a particular branch' '
 	test_must_fail git config branch.my14.merge
 '

-test_expect_success '--set-upstream fails' '
-    test_must_fail git branch --set-upstream origin/master
+test_expect_success '--set-upstream-to fails' '
+    test_must_fail git branch --set-upstream-to origin/master
 '

 test_expect_success '--set-upstream-to notices an error to set branch as own upstream' '
-- 
========================================================================
Robert P. J. Day                                 Ottawa, Ontario, CANADA
                  http://crashcourse.ca/dokuwiki

Twitter:                                       http://twitter.com/rpjday
LinkedIn:                               http://ca.linkedin.com/in/rpjday
========================================================================
Next: SZEDER Gábor
Message 1 of 8 in “t3200-branch.sh: use "--set-upstream-to" in test”
  1. t3200-branch.sh: use "--set-upstream-to" in testRobert P. J. Day, Jun 5, 2018
  2. SZEDER GáborJun 5, 2018
  3. Robert P. J. DayJun 5, 2018
  4. Kaartic SivaraamJun 6, 2018
  5. t3200: clarify description of --set-upstream testKaartic Sivaraam, Jun 14, 2018
  6. Junio C HamanoJun 14, 2018
  7. Kaartic SivaraamJun 17, 2018
  8. t3200: clarify description of --set-upstream testKaartic Sivaraam, Jun 17, 2018

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.