diff options
| author | Brandon Williams <bmwill@google.com> | 2017-08-02 22:49:20 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-03 00:26:46 +0300 |
| commit | 91b834807b98b620050fe534b6de93e223dbcbcf (patch) | |
| tree | 6fe6b91d477bae8b1ccbba44eb1b29661bd9efc5 /builtin/rm.c | |
| parent | 8fa2915971e5032e6a32f5096452db81ab8795eb (diff) | |
submodule: check for unstaged .gitmodules outside of config parsing
Teach 'is_staging_gitmodules_ok()' to be able to determine in the
'.gitmodules' file has unstaged changes 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>
Diffstat (limited to 'builtin/rm.c')
| -rw-r--r-- | builtin/rm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rm.c b/builtin/rm.c index 52826d13793..4057e73fa04 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -286,7 +286,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix) list.entry[list.nr].name = xstrdup(ce->name); list.entry[list.nr].is_submodule = S_ISGITLINK(ce->ce_mode); if (list.entry[list.nr++].is_submodule && - !is_staging_gitmodules_ok()) + !is_staging_gitmodules_ok(&the_index)) die (_("Please stage your changes to .gitmodules or stash them to proceed")); } |