summaryrefslogtreecommitdiff
path: root/submodule.h
diff options
context:
space:
mode:
authorJens Lehmann <Jens.Lehmann@web.de>2013-07-30 21:50:34 +0200
committerJunio C Hamano <gitster@pobox.com>2013-07-30 14:39:56 -0700
commit5fee995244e13fd59500425d49038b00499396f8 (patch)
treec0fe10fd933f099fbbdcd300cc3ae7b5c712d555 /submodule.h
parenta88c915de9886fe17005a5daff4900ced0ea76ad (diff)
downloadgit-5fee995244e13fd59500425d49038b00499396f8.tar.gz
submodule.c: add .gitmodules staging helper functions
Add the new is_staging_gitmodules_ok() and stage_updated_gitmodules() functions to submodule.c. The first makes it possible for call sites to see if the .gitmodules file did contain any unstaged modifications they would accidentally stage in addition to those they intend to stage themselves. The second function stages all modifications to the .gitmodules file, both will be used by subsequent patches for the mv and rm commands. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.h')
-rw-r--r--submodule.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/submodule.h b/submodule.h
index 29e9658980..5501354568 100644
--- a/submodule.h
+++ b/submodule.h
@@ -11,6 +11,8 @@ enum {
RECURSE_SUBMODULES_ON = 2
};
+int is_staging_gitmodules_ok(void);
+void stage_updated_gitmodules(void);
void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
const char *path);
int submodule_config(const char *var, const char *value, void *cb);