diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-04-06 11:39:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-06 11:39:11 -0700 |
| commit | aad627e3c0e7dcf5a59da80cb424e8a4093b0324 (patch) | |
| tree | 6de618e5e855a985e42e6020eff41c59123699e1 /builtin/upload-archive.c | |
| parent | Merge branch 'ss/commit-squash-msg' (diff) | |
| parent | merge: fix NULL pointer dereference when merging nothing into void (diff) | |
| download | tgif-aad627e3c0e7dcf5a59da80cb424e8a4093b0324.tar.xz | |
Merge branch 'jv/merge-nothing-into-void'
"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 'builtin/upload-archive.c')
0 files changed, 0 insertions, 0 deletions