git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Robert P. J. Day" <rpjday@crashcourse.ca>
To: Git Mailing list <git@vger.kernel.org>
Subject: [PATCH] t3200-branch.sh: use "--set-upstream-to" in test
Date: Tue, 5 Jun 2018 07:14:45 -0400 (EDT)	[thread overview]
Message-ID: <alpine.LFD.2.21.1806050712270.10467@localhost.localdomain> (raw)


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
========================================================================

             reply	other threads:[~2018-06-05 11:17 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-05 11:14 Robert P. J. Day [this message]
2018-06-05 11:24 ` [PATCH] t3200-branch.sh: use "--set-upstream-to" in test SZEDER Gábor
2018-06-05 11:34   ` Robert P. J. Day
2018-06-06 15:50   ` Kaartic Sivaraam
2018-06-14 14:06   ` [PATCH] t3200: clarify description of --set-upstream test Kaartic Sivaraam
2018-06-14 17:43     ` Junio C Hamano
2018-06-17  8:53       ` Kaartic Sivaraam
2018-06-17 11:56       ` [PATCH v2] " Kaartic Sivaraam

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.LFD.2.21.1806050712270.10467@localhost.localdomain \
    --to=rpjday@crashcourse.ca \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).