aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-16 16:47:26 -0700
committerJunio C Hamano <gitster@pobox.com>2011-03-16 16:47:26 -0700
commit61a6f1faecf19d7727bdfae012a14747c672cb1a (patch)
tree414004f8e28dfbd74f37ed161bc0dd491219b01e /builtin
parent7633a5ab9a33f90fc0fb912d7403f6c21c5435c1 (diff)
parent53c403116a947c538132fc721f83196036f7a299 (diff)
downloadgit-61a6f1faecf19d7727bdfae012a14747c672cb1a.tar.gz
git-61a6f1faecf19d7727bdfae012a14747c672cb1a.tar.xz
Merge branch 'jh/push-default-upstream-configname' into maint
* jh/push-default-upstream-configname: push.default: Rename 'tracking' to 'upstream'
Diffstat (limited to 'builtin')
-rw-r--r--builtin/push.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin/push.c b/builtin/push.c
index e655eb769..31da418cf 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -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: