diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:57:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:57:49 -0700 |
| commit | a5953f68186e72b3fe7b7dc0b2a7cb0f451cf3ef (patch) | |
| tree | abad8ddc1b590700b28d29973cd05fb2fd9d4894 /t/helper/test-string-list.c | |
| parent | Merge branch 'ss/commit-squash-msg' into maint (diff) | |
| parent | merge: fix NULL pointer dereference when merging nothing into void (diff) | |
| download | git-a5953f68186e72b3fe7b7dc0b2a7cb0f451cf3ef.tar.gz git-a5953f68186e72b3fe7b7dc0b2a7cb0f451cf3ef.zip | |
Merge branch 'jv/merge-nothing-into-void' into maint
"git merge FETCH_HEAD" dereferenced NULL pointer when merging
nothing into an unborn history (which is arguably unusual usage,
which perhaps was the reason why nobody noticed it).
* jv/merge-nothing-into-void:
merge: fix NULL pointer dereference when merging nothing into void
Diffstat (limited to 't/helper/test-string-list.c')
0 files changed, 0 insertions, 0 deletions