]> git.ipfire.org Git - thirdparty/git.git/commit - submodule.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 91b8348) | patch
submodule: check for unmerged .gitmodules outside of config parsing
authorBrandon Williams <bmwill@google.com>
Wed, 2 Aug 2017 19:49:21 +0000 (12:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Aug 2017 21:26:46 +0000 (14:26 -0700)
commit34e2ba04be4f8e11d91b2508aa8ca84148fe63f1
tree247d499157f99ab83d9aa15326b387c2d3f3108ftree | snapshot
parent91b834807b98b620050fe534b6de93e223dbcbcfcommit | diff
submodule: check for unmerged .gitmodules outside of config parsing

Add 'is_gitmodules_unmerged()' function which can be used to determine
in the '.gitmodules' file is unmerged based on the passed in index
instead of relying on a global variable which is set during the
submodule-config parsing.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
submodule.c diff | blob | blame | history
submodule.h diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.