diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-07 15:15:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-07 15:15:08 -0800 |
| commit | 772847341bc6ea73c57f350ae25688eae95c5c23 (patch) | |
| tree | 78b1ff551578fa5e0495ac3cf298a6e1a301e7f5 | |
| parent | d2216a4b133f90a543a0e4c4a9f9809a043012d6 (diff) | |
| parent | 1d2c14df1605a05118524b2382402d689f69d737 (diff) | |
| download | git-772847341bc6ea73c57f350ae25688eae95c5c23.tar.gz | |
Merge branch 'ft/transport-report-segv' into maint
A failure to push due to non-ff while on an unborn branch
dereferenced a NULL pointer when showing an error message.
* ft/transport-report-segv:
push: fix segfault when HEAD points nowhere
| -rw-r--r-- | transport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/transport.c b/transport.c index 9932f402df..b9306ef645 100644 --- a/transport.c +++ b/transport.c @@ -741,7 +741,7 @@ void transport_print_push_status(const char *dest, struct ref *refs, n += print_one_push_status(ref, dest, n, porcelain); if (ref->status == REF_STATUS_REJECT_NONFASTFORWARD && *nonfastforward != NON_FF_HEAD) { - if (!strcmp(head, ref->name)) + if (head != NULL && !strcmp(head, ref->name)) *nonfastforward = NON_FF_HEAD; else *nonfastforward = NON_FF_OTHER; |