[PATCH 3/7] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple
Change 'git push' to 'git push -u ' in one of the
test-bzr.sh tests to ensure that the test continues to pass when the
default value of push.default changes to simple.
Also, explicitly set push.default to simple to silence warnings when
using --verbose.
Signed-off-by: Richard Hansen
---
contrib/remote-helpers/test-bzr.sh | 5 -
contrib/remote-helpers/test-hg.sh | 3 +++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/contrib/remote-helpers/test-bzr.sh
b/contrib/remote-helpers/test-bzr.sh
index 094062c..ea597b0 100755
--- a/contrib/remote-helpers/test-bzr.sh
+++ b/contrib/remote-helpers/test-bzr.sh
@@ -28,6 +28,9 @@ check () {
bzr whoami "A U Thor "
+# silence warnings
+git config --global push.default simple
+
test_expect_success 'cloning' '
(
bzr init bzrrepo &&
@@ -379,7 +382,7 @@ test_expect_success 'export utf-8 authors' '
git add content &&
git commit -m one &&
git remote add bzr "bzr::../bzrrepo" &&
- git push bzr
+ git push -u bzr master
) &&
(
diff --git a/contrib/remote-helpers/test-hg.sh
b/contrib/remote-helpers/test-hg.sh
index dbe0eec..53f2bba 100755
--- a/contrib/remote-helpers/test-hg.sh
+++ b/contrib/remote-helpers/test-hg.sh
@@ -102,6 +102,9 @@ setup () {
GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230" &&
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" &&
export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
+
+ # silence warnings
+ git config --global push.default simple
}
setup
--
1.8.5.rc1.207.gc17dd22
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH 3/7] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple
Richard Hansen wrote: > Change 'git push' to 'git push -u ' in one of the > test-bzr.sh tests to ensure that the test continues to pass when the > default value of push.default changes to simple. This makes sense. > Also, explicitly set push.default to simple to silence warnings when > using --verbose. This doesn't. Run the tests in t/* and you would seen tons and tons of those warnings, if they should be avoided, they should be avoided for all the tests, why only these? I say drop the second part. Yes it's annoying, but we have to deal with it. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/7] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple
On 2013-11-11 06:37, Felipe Contreras wrote: > Richard Hansen wrote: >> Change 'git push' to 'git push -u ' in one of the >> test-bzr.sh tests to ensure that the test continues to pass when the >> default value of push.default changes to simple. > > This makes sense. > >> Also, explicitly set push.default to simple to silence warnings when >> using --verbose. > > This doesn't. Run the tests in t/* and you would seen tons and tons of those > warnings, if they should be avoided, they should be avoided for all the tests, > why only these? > > I say drop the second part. Yes it's annoying, but we have to deal with it. OK, will do. Thanks, Richard -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/7] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple
On Sun, Nov 10, 2013 at 10:05 PM, Richard Hansen wrote: > @@ -379,7 +382,7 @@ test_expect_success 'export utf-8 authors' ' > git add content && > git commit -m one && > git remote add bzr "bzr::../bzrrepo" && > - git push bzr > + git push -u bzr master > ) && Actually, why -u? Isn't 'git push bzr master' enough? -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/7] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple
On 2013-11-11 14:31, Felipe Contreras wrote: > On Sun, Nov 10, 2013 at 10:05 PM, Richard Hansen wrote: > >> @@ -379,7 +382,7 @@ test_expect_success 'export utf-8 authors' ' >> git add content && >> git commit -m one && >> git remote add bzr "bzr::../bzrrepo" && >> - git push bzr >> + git push -u bzr master >> ) && > > Actually, why -u? Isn't 'git push bzr master' enough? It's defensive in case that test is ever updated to do more pushing. I can leave it out in the reroll. -Richard -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/7] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple
On Mon, Nov 11, 2013 at 3:16 PM, Richard Hansen wrote: > On 2013-11-11 14:31, Felipe Contreras wrote: >> On Sun, Nov 10, 2013 at 10:05 PM, Richard Hansen wrote: >> >>> @@ -379,7 +382,7 @@ test_expect_success 'export utf-8 authors' ' >>> git add content && >>> git commit -m one && >>> git remote add bzr "bzr::../bzrrepo" && >>> - git push bzr >>> + git push -u bzr master >>> ) && >> >> Actually, why -u? Isn't 'git push bzr master' enough? > > It's defensive in case that test is ever updated to do more pushing. I > can leave it out in the reroll. Please do. If there's any need for that we can add it later, but even then I would prefer that the push explicit again, like this one. And suspect we will not need to update this in that direction. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
