summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-11-05 12:18:14 -0800
committerJunio C Hamano <gitster@pobox.com>2015-11-05 12:18:14 -0800
commitf97aee1f941a08a741c7ce2b0dfb6db7d0cc042e (patch)
tree5cb52ec484c40278ad9adbdb73e20a254bea1b9d /resolve-undo.h
parentace5348dcb427bbce015a42a21a46dc02ae1b37b (diff)
parent9a6e4f032ef7ca45a71639ff5e60cbb9b8a6e556 (diff)
downloadgit-f97aee1f941a08a741c7ce2b0dfb6db7d0cc042e.tar.gz
Merge branch 'jk/initialization-fix-to-add-submodule-odb' into maint
We peek objects from submodule's object store by linking it to the list of alternate object databases, but the code to do so forgot to correctly initialize the list. * jk/initialization-fix-to-add-submodule-odb: add_submodule_odb: initialize alt_odb list earlier
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions