diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-08-07 20:44:49 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-08-07 20:44:49 -0700 |
commit | 7ecc9b153c89aeec7470256f7b121fd845101b57 (patch) | |
tree | 0bf662b5dd1ffe642756f5cb168902a89b60506a /builtin-push.c | |
parent | c9c3c6781c5b97c37b3ce16af7ea9bc613413c7e (diff) | |
parent | 5dc36a5888a7063ff4536c9ea50eb0557bfef627 (diff) | |
download | git-7ecc9b153c89aeec7470256f7b121fd845101b57.tar.gz git-7ecc9b153c89aeec7470256f7b121fd845101b57.tar.xz |
Merge branch 'maint' into jc/verify-pack-stat
* maint: (95 commits)
verify-pack -v: do not report "chain length 0"
t5510: harden the way verify-pack is used
gitweb/README: Document $base_url
Documentation: git submodule: add missing options to synopsis
Better usage string for reflog.
hg-to-git: don't import the unused popen2 module
send-email: remove debug trace
config: Keep inner whitespace verbatim
GIT 1.6.4
GIT 1.6.3.4
config.txt: document add.ignore-errors
request-pull: allow ls-remote to notice remote.$nickname.uploadpack
Update the documentation of the raw diff output format
git-rerere.txt: Clarify ambiguity of the config variable
t9143: do not fail if Compress::Zlib is missing
Trivial path quoting fixes in git-instaweb
GIT 1.6.4-rc3
Documentation/config.txt: a variable can be defined on the section header line
git svn: make minimize URL more reliable over http(s)
Disable asciidoc 8.4.1+ semantics for `{plus}` and friends
...
Diffstat (limited to 'builtin-push.c')
-rw-r--r-- | builtin-push.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/builtin-push.c b/builtin-push.c index 0a0297f98..1d92e22f0 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -64,36 +64,11 @@ static void setup_push_tracking(void) add_refspec(refspec.buf); } -static const char *warn_unconfigured_push_msg[] = { - "You did not specify any refspecs to push, and the current remote", - "has not configured any push refspecs. The default action in this", - "case is to push all matching refspecs, that is, all branches", - "that exist both locally and remotely will be updated. This may", - "not necessarily be what you want to happen.", - "", - "You can specify what action you want to take in this case, and", - "avoid seeing this message again, by configuring 'push.default' to:", - " 'nothing' : Do not push anything", - " 'matching' : Push all matching branches (default)", - " 'tracking' : Push the current branch to whatever it is tracking", - " 'current' : Push the current branch" -}; - -static void warn_unconfigured_push(void) -{ - int i; - for (i = 0; i < ARRAY_SIZE(warn_unconfigured_push_msg); i++) - warning("%s", warn_unconfigured_push_msg[i]); -} - static void setup_default_push_refspecs(void) { git_config(git_default_config, NULL); switch (push_default) { - case PUSH_DEFAULT_UNSPECIFIED: - warn_unconfigured_push(); - /* fallthrough */ - + default: case PUSH_DEFAULT_MATCHING: add_refspec(":"); break; |