git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* [PATCH] submodule: mark some file-local symbols as static
@ 2017-05-31 13:50 Ramsay Jones
  0 siblings, 0 replies; only message in thread
From: Ramsay Jones @ 2017-05-31 13:50 UTC (permalink / raw)
  To: Stefan Beller; +Cc: Junio C Hamano, GIT Mailing-list


Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---

Hi Stefan,

If you need to re-roll your 'sb/submodule-blanket-recursive' branch,
could you please squash this into the relevant patch (commit 0e5bca302a
"Introduce 'submodule.recurse' option for worktree manipulators",
26-05-2017).

Thanks!

ATB,
Ramsay Jones

 builtin/read-tree.c | 2 +-
 builtin/reset.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index ad317c736..5bfd4c9f7 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -98,7 +98,7 @@ static int debug_merge(const struct cache_entry * const *stages,
 	return 0;
 }
 
-int git_read_tree_config(const char *var, const char *value, void *cb)
+static int git_read_tree_config(const char *var, const char *value, void *cb)
 {
 	if (!strcmp(var, "submodule.recurse"))
 		return git_default_submodule_config(var, value, cb);
diff --git a/builtin/reset.c b/builtin/reset.c
index 48bc58cc7..45001e520 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -265,7 +265,7 @@ static int reset_refs(const char *rev, const struct object_id *oid)
 	return update_ref_status;
 }
 
-int git_reset_config(const char *var, const char *value, void *cb)
+static int git_reset_config(const char *var, const char *value, void *cb)
 {
 	if (!strcmp(var, "submodule.recurse"))
 		return git_default_submodule_config(var, value, cb);
-- 
2.13.0

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2017-05-31 13:50 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-31 13:50 [PATCH] submodule: mark some file-local symbols as static Ramsay Jones

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).