diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-07 12:47:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-07 12:47:16 -0800 |
| commit | 796a01c41ca0b66f798571c7e876b3de4607f498 (patch) | |
| tree | ce87bc42b13af342454b377400083b816b0e2668 | |
| parent | 512c9169415823fca013ac835921a5321654f2de (diff) | |
| parent | db03b55781f23a9276234faf9a21922ff8c5678d (diff) | |
| download | git-796a01c41ca0b66f798571c7e876b3de4607f498.tar.gz git-796a01c41ca0b66f798571c7e876b3de4607f498.tar.xz | |
Merge branch 'jk/maint-push-tracking-wo-remote'
* 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 5633f0ade..f7bc2b292 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) |