undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jh/push-default-upstream-configname' into maint

Browse Source 
* jh/push-default-upstream-configname:
  push.default: Rename 'tracking' to 'upstream'
This commit is contained in:
Junio C Hamano 2011-03-16 16:47:26 -07:00
commit 61a6f1faec
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/config.txt
View File

@ -1582,7 +1582,8 @@ push.default::
* `matching` - push all matching branches.
All branches having the same name in both ends are considered to be
matching. This is the default.
* `tracking` - push the current branch to its upstream branch.
* `upstream` - push the current branch to its upstream branch.
* `tracking` - deprecated synonym for `upstream`.
* `current` - push the current branch to a branch of the same name.
rebase.stat::

10
builtin/push.c
View File

@ -64,17 +64,17 @@ static void set_refspecs(const char **refs, int nr)
}
}
static void setup_push_tracking(void)
static void setup_push_upstream(void)
{
struct strbuf refspec = STRBUF_INIT;
struct branch *branch = branch_get(NULL);
if (!branch)
die("You are not currently on a branch.");
if (!branch->merge_nr || !branch->merge)
die("The current branch %s is not tracking anything.",
die("The current branch %s has no upstream branch.",
branch->name);
if (branch->merge_nr != 1)
die("The current branch %s is tracking multiple branches, "
die("The current branch %s has multiple upstream branches, "
"refusing to push.", branch->name);
strbuf_addf(&refspec, "%s:%s", branch->name, branch->merge[0]->src);
add_refspec(refspec.buf);
@ -88,8 +88,8 @@ static void setup_default_push_refspecs(void)
add_refspec(":");
break;
case PUSH_DEFAULT_TRACKING:
setup_push_tracking();
case PUSH_DEFAULT_UPSTREAM:
setup_push_upstream();
break;
case PUSH_DEFAULT_CURRENT:

2
cache.h
View File

@ -607,7 +607,7 @@ enum rebase_setup_type {
enum push_default_type {
PUSH_DEFAULT_NOTHING = 0,
PUSH_DEFAULT_MATCHING,
PUSH_DEFAULT_TRACKING,
PUSH_DEFAULT_UPSTREAM,
PUSH_DEFAULT_CURRENT
};

6
config.c
View File

@ -729,8 +729,10 @@ static int git_default_push_config(const char *var, const char *value)
push_default = PUSH_DEFAULT_NOTHING;
else if (!strcmp(value, "matching"))
push_default = PUSH_DEFAULT_MATCHING;
else if (!strcmp(value, "tracking"))
push_default = PUSH_DEFAULT_TRACKING;
else if (!strcmp(value, "upstream"))
push_default = PUSH_DEFAULT_UPSTREAM;
else if (!strcmp(value, "tracking")) /* deprecated */
push_default = PUSH_DEFAULT_UPSTREAM;
else if (!strcmp(value, "current"))
push_default = PUSH_DEFAULT_CURRENT;
else {