push.default was too generic, and also didn't specify if it was about
remote, refspec, branches, behaviour...
Signed-off-by: Santi Béjar <santi@xxxxxxxxxxx>
---
Documentation/RelNotes-1.6.3.txt | 2 +-
Documentation/config.txt | 4 ++--
builtin-push.c | 16 ++++++++--------
cache.h | 14 +++++++-------
config.c | 10 +++++-----
environment.c | 2 +-
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/Documentation/RelNotes-1.6.3.txt b/Documentation/RelNotes-1.6.3.txt
index f0a2e41..f3533e6 100644
--- a/Documentation/RelNotes-1.6.3.txt
+++ b/Documentation/RelNotes-1.6.3.txt
@@ -24,7 +24,7 @@ receive.denyDeleteCurrent in the receiving repository.
When the user does not tell "git push" what to push, it has always
pushed matching refs. For some people it is unexpected, and a new
-configuration variable push.default has been introduced to allow
+configuration variable push.style has been introduced to allow
changing a different default behaviour. To advertise the new feature,
a big warning is issued if this is not configured and a git push without
arguments is attempted.
diff --git a/Documentation/config.txt b/Documentation/config.txt
index cb392fd..f2d675a 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -480,7 +480,7 @@ branch.<name>.remote::
branch.<name>.merge::
It defines, together with branch.<name>.remote, the tracking branch
for the current branch. It tells 'git-fetch'/'git-pull' which
- branch to merge and can also afect 'git-push' (see push.default).
+ branch to merge and can also afect 'git-push' (see push.style).
When in branch <name>, it tells 'git-fetch' the default
refspec to be marked for merging in FETCH_HEAD. The value is
handled like the remote part of a refspec, and must match a
@@ -1215,7 +1215,7 @@ pull.octopus::
pull.twohead::
The default merge strategy to use when pulling a single branch.
-push.default::
+push.style::
Defines the action git push should take if no refspec is given
on the command line, no refspec is configured in the remote, and
no refspec is implied by any of the options given on the command
diff --git a/builtin-push.c b/builtin-push.c
index 2eabcd3..ba0dd6f 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -72,7 +72,7 @@ static const char *warn_unconfigured_push_msg[] = {
"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:",
+ "avoid seeing this message again, by configuring 'push.style' to:",
" 'nothing' : Do not push anything",
" 'matching' : Push all matching branches (default)",
" 'tracking' : Push the current branch to whatever it is tracking",
@@ -89,26 +89,26 @@ static void warn_unconfigured_push(void)
static void setup_default_push_refspecs(void)
{
git_config(git_default_config, NULL);
- switch (push_default) {
- case PUSH_DEFAULT_UNSPECIFIED:
+ switch (push_style) {
+ case PUSH_STYLE_UNSPECIFIED:
warn_unconfigured_push();
/* fallthrough */
- case PUSH_DEFAULT_MATCHING:
+ case PUSH_STYLE_MATCHING:
add_refspec(":");
break;
- case PUSH_DEFAULT_TRACKING:
+ case PUSH_STYLE_TRACKING:
setup_push_tracking();
break;
- case PUSH_DEFAULT_CURRENT:
+ case PUSH_STYLE_CURRENT:
add_refspec("HEAD");
break;
- case PUSH_DEFAULT_NOTHING:
+ case PUSH_STYLE_NOTHING:
die("You didn't specify any refspecs to push, and "
- "push.default is \"nothing\".");
+ "push.style is \"nothing\".");
break;
}
}
diff --git a/cache.h b/cache.h
index 641529b..9190046 100644
--- a/cache.h
+++ b/cache.h
@@ -542,17 +542,17 @@ enum rebase_setup_type {
AUTOREBASE_ALWAYS,
};
-enum push_default_type {
- PUSH_DEFAULT_UNSPECIFIED = -1,
- PUSH_DEFAULT_NOTHING = 0,
- PUSH_DEFAULT_MATCHING,
- PUSH_DEFAULT_TRACKING,
- PUSH_DEFAULT_CURRENT,
+enum push_style_type {
+ PUSH_STYLE_UNSPECIFIED = -1,
+ PUSH_STYLE_NOTHING = 0,
+ PUSH_STYLE_MATCHING,
+ PUSH_STYLE_TRACKING,
+ PUSH_STYLE_CURRENT,
};
extern enum branch_track git_branch_track;
extern enum rebase_setup_type autorebase;
-extern enum push_default_type push_default;
+extern enum push_style_type push_style;
#define GIT_REPO_VERSION 0
extern int repository_format_version;
diff --git a/config.c b/config.c
index b76fe4c..86ac830 100644
--- a/config.c
+++ b/config.c
@@ -567,17 +567,17 @@ static int git_default_branch_config(const char *var, const char *value)
static int git_default_push_config(const char *var, const char *value)
{
- if (!strcmp(var, "push.default")) {
+ if (!strcmp(var, "push.style")) {
if (!value)
return config_error_nonbool(var);
else if (!strcmp(value, "nothing"))
- push_default = PUSH_DEFAULT_NOTHING;
+ push_style = PUSH_STYLE_NOTHING;
else if (!strcmp(value, "matching"))
- push_default = PUSH_DEFAULT_MATCHING;
+ push_style = PUSH_STYLE_MATCHING;
else if (!strcmp(value, "tracking"))
- push_default = PUSH_DEFAULT_TRACKING;
+ push_style = PUSH_STYLE_TRACKING;
else if (!strcmp(value, "current"))
- push_default = PUSH_DEFAULT_CURRENT;
+ push_style = PUSH_STYLE_CURRENT;
else {
error("Malformed value for %s: %s", var, value);
return error("Must be one of nothing, matching, "
diff --git a/environment.c b/environment.c
index 4696885..8d2450c 100644
--- a/environment.c
+++ b/environment.c
@@ -42,7 +42,7 @@ enum safe_crlf safe_crlf = SAFE_CRLF_WARN;
unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;
enum rebase_setup_type autorebase = AUTOREBASE_NEVER;
-enum push_default_type push_default = PUSH_DEFAULT_UNSPECIFIED;
+enum push_style_type push_style = PUSH_STYLE_UNSPECIFIED;
/* Parallel index stat data preload? */
int core_preload_index = 0;
--
1.6.1.258.g7ff14
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
