diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-02-27 21:58:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-27 21:58:31 -0800 |
| commit | 8978166e531e0941811099d4117574ebbbcf35d8 (patch) | |
| tree | 97c222b3705ea1980557ae1f96dda1d272625a83 /builtin | |
| parent | Merge branch 'lp/config-vername-check' (diff) | |
| parent | push.default: Rename 'tracking' to 'upstream' (diff) | |
| download | tgif-8978166e531e0941811099d4117574ebbbcf35d8.tar.xz | |
Merge branch 'jh/push-default-upstream-configname'
* jh/push-default-upstream-configname:
push.default: Rename 'tracking' to 'upstream'
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/push.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin/push.c b/builtin/push.c index e655eb7695..31da418cf4 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: |