summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-06-28 12:53:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-28 12:53:34 -0700
commit085d2abf57be3e424cad0b7dc8c27fe41921258e (patch)
tree758920947d1b46faf51fbfd963471c12ef5aa915 /notes-merge.c
parentMerge branch 'tz/cred-netrc-cleanup' (diff)
parentt5526: test recursive submodules when fetching moved submodules (diff)
downloadtgif-085d2abf57be3e424cad0b7dc8c27fe41921258e.tar.xz
Merge branch 'sb/fix-fetching-moved-submodules'
The code to try seeing if a fetch is necessary in a submodule during a fetch with --recurse-submodules got confused when the path to the submodule was changed in the range of commits in the superproject, sometimes showing "(null)". This has been corrected. * sb/fix-fetching-moved-submodules: t5526: test recursive submodules when fetching moved submodules submodule: fix NULL correctness in renamed broken submodules
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions