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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
