summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-01 14:14:43 +0900
committerJunio C Hamano <gitster@pobox.com>2017-05-01 14:14:44 +0900
commitd92dbf1934faad614c31482446d5f32fb9322470 (patch)
treef47557d9a01abea4b8a799854c0cc5551be11373 /builtin/merge.c
parentb0f89870ea54b86fb7935f90605d329533849b33 (diff)
parent627fde102515a7807dba89acaa88cb053b38a44a (diff)
downloadgit-d92dbf1934faad614c31482446d5f32fb9322470.tar.gz
Merge branch 'jk/submodule-init-segv-fix'
Fix a segv in 'submodule init' when url is not given for a submodule. * jk/submodule-init-segv-fix: submodule_init: die cleanly on submodules without url defined
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions