diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-08 00:36:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-08 00:36:01 -0800 |
| commit | 57c118c268a01b00954916e344f2eb082eafaaaf (patch) | |
| tree | 52a827f54947269dc82376f3e021ef0136bed85d | |
| parent | 2dd96ea21fb964a6890549c24bdeba42a759f401 (diff) | |
| parent | db03b55781f23a9276234faf9a21922ff8c5678d (diff) | |
| download | git-57c118c268a01b00954916e344f2eb082eafaaaf.tar.gz | |
Merge branch 'jk/maint-push-tracking-wo-remote' into maint
* jk/maint-push-tracking-wo-remote:
push: fix segfault for odd config
| -rw-r--r-- | builtin-push.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-push.c b/builtin-push.c index 5633f0ade4..f7bc2b292f 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -68,7 +68,7 @@ static void setup_push_tracking(void) struct branch *branch = branch_get(NULL); if (!branch) die("You are not currently on a branch."); - if (!branch->merge_nr) + if (!branch->merge_nr || !branch->merge) die("The current branch %s is not tracking anything.", branch->name); if (branch->merge_nr != 1) |