git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
	Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH 0/6] Re-roll rr/triangle
Date: Tue,  2 Apr 2013 13:10:28 +0530	[thread overview]
Message-ID: <1364888434-30388-1-git-send-email-artagnon@gmail.com> (raw)

There are two important changes in this round:

1. Rebased on latest master, resolving all conflicts (all in t5516).
   I ran the testsuite immediately after resolving the conflicts, so
   everything should be good.

2. Peff's suggestion to avoid using test_must_fail on compound
   statements.  I've changed the meaning of the tests slightly to
   (approximately) invert the tests.  The inter-diff follows.

diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 13028a4..3281ff1 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -521,14 +521,14 @@ git config --remove-section remote.there
 git config --remove-section branch.master
 
 test_expect_success 'push with remote.pushdefault' '
-	mk_test up_repo heads/frotz &&
+	mk_test up_repo heads/master &&
 	mk_test down_repo heads/master &&
 	test_config remote.up.url up_repo &&
 	test_config remote.down.url down_repo &&
 	test_config branch.master.remote up &&
 	test_config remote.pushdefault down &&
 	git push &&
-	test_must_fail check_push_result up_repo $the_commit heads/master &&
+	check_push_result up_repo $the_first_commit heads/master &&
 	check_push_result down_repo $the_commit heads/master
 '
 
@@ -543,8 +543,8 @@ test_expect_success 'push with config remote.*.pushurl' '
 '
 
 test_expect_success 'push with config branch.*.pushremote' '
-	mk_test up_repo heads/frotz &&
-	mk_test side_repo heads/quux &&
+	mk_test up_repo heads/master &&
+	mk_test side_repo heads/master &&
 	mk_test down_repo heads/master &&
 	test_config remote.up.url up_repo &&
 	test_config remote.pushdefault side_repo &&
@@ -552,8 +552,8 @@ test_expect_success 'push with config branch.*.pushremote' '
 	test_config branch.master.remote up &&
 	test_config branch.master.pushremote down &&
 	git push &&
-	test_must_fail check_push_result up_repo $the_commit heads/master &&
-	test_must_fail check_push_result side_repo $the_commit heads/master &&
+	check_push_result up_repo $the_first_commit heads/master &&
+	check_push_result side_repo $the_first_commit heads/master &&
 	check_push_result down_repo $the_commit heads/master
 '

Jeff King (1):
  t5516 (fetch-push): drop implicit arguments from helper functions

Ramkumar Ramachandra (5):
  remote.c: simplify a bit of code using git_config_string()
  t5516 (fetch-push): update test description
  remote.c: introduce a way to have different remotes for fetch/push
  remote.c: introduce remote.pushdefault
  remote.c: introduce branch.<name>.pushremote

 Documentation/config.txt |  24 +++-
 builtin/push.c           |   2 +-
 remote.c                 |  41 ++++--
 remote.h                 |   1 +
 t/t5516-fetch-push.sh    | 322 +++++++++++++++++++++++++++--------------------
 5 files changed, 241 insertions(+), 149 deletions(-)

-- 
1.8.2.363.g901f5bc

             reply	other threads:[~2013-04-02  7:39 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-02  7:40 Ramkumar Ramachandra [this message]
2013-04-02  7:40 ` [PATCH 1/6] remote.c: simplify a bit of code using git_config_string() Ramkumar Ramachandra
2013-04-02  7:40 ` [PATCH 2/6] t5516 (fetch-push): update test description Ramkumar Ramachandra
2013-04-02  7:40 ` [PATCH 3/6] t5516 (fetch-push): drop implicit arguments from helper functions Ramkumar Ramachandra
2013-04-02  7:40 ` [PATCH 4/6] remote.c: introduce a way to have different remotes for fetch/push Ramkumar Ramachandra
2013-04-02  7:40 ` [PATCH 5/6] remote.c: introduce remote.pushdefault Ramkumar Ramachandra
2013-04-02  7:40 ` [PATCH 6/6] remote.c: introduce branch.<name>.pushremote Ramkumar Ramachandra
2013-04-02 13:58 ` [PATCH 0/6] Re-roll rr/triangle Jeff King
2013-04-02 17:28   ` Junio C Hamano
2013-04-02 17:52     ` Jeff King

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

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

  git send-email \
    --in-reply-to=1364888434-30388-1-git-send-email-artagnon@gmail.com \
    --to=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=peff@peff.net \
    /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. 
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 NNTP newsgroup(s).