undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ft/transport-report-segv' into maint

Browse Source 
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
This commit is contained in:
Junio C Hamano 2013-02-07 15:15:08 -08:00
commit 772847341b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
transport.c
View File

@ -741,7 +741,7 @@ void transport_print_push_status(const char *dest, struct ref *refs,
n += print_one_push_status(ref, dest, n, porcelain); n += print_one_push_status(ref, dest, n, porcelain);
if (ref->status == REF_STATUS_REJECT_NONFASTFORWARD && if (ref->status == REF_STATUS_REJECT_NONFASTFORWARD &&
*nonfastforward != NON_FF_HEAD) { *nonfastforward != NON_FF_HEAD) {
if (!strcmp(head, ref->name)) if (head != NULL && !strcmp(head, ref->name))
*nonfastforward = NON_FF_HEAD; *nonfastforward = NON_FF_HEAD;
else else
*nonfastforward = NON_FF_OTHER; *nonfastforward = NON_FF_OTHER;