summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0c4cd7f)
raw | patch | inline | side by side (parent: 0c4cd7f)
author | Stephan Beyer <s-beyer@gmx.net> | |
Wed, 23 Jul 2008 23:09:35 +0000 (01:09 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 24 Jul 2008 01:38:14 +0000 (18:38 -0700) |
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-commit.c | patch | blob | history | |
builtin-config.c | patch | blob | history | |
builtin-for-each-ref.c | patch | blob | history | |
builtin-merge.c | patch | blob | history |
diff --git a/builtin-commit.c b/builtin-commit.c
index 7434797d1b850b25d13aab8d7aeaf85d02109a61..6a9dc0e30fc23d79df099fbd05b69bacf54238be 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
}
}
-int git_commit_config(const char *k, const char *v, void *cb)
+static int git_commit_config(const char *k, const char *v, void *cb)
{
if (!strcmp(k, "commit.template"))
return git_config_string(&template_file, k, v);
diff --git a/builtin-config.c b/builtin-config.c
index 0cf191a11294f902d25aeda29e7290f3ab78b482..91fdc4985d8e64fae12209174dd4aa2d887793e5 100644 (file)
--- a/builtin-config.c
+++ b/builtin-config.c
return ret;
}
-char *normalize_value(const char *key, const char *value)
+static char *normalize_value(const char *key, const char *value)
{
char *normalized;
diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c
index 76282ad79193e2a5f0ec2ba8e5027025f8a7bee1..445039e19c75e4c9321f7ee64289ef8201a25c14 100644 (file)
--- a/builtin-for-each-ref.c
+++ b/builtin-for-each-ref.c
return sort;
}
-int opt_parse_sort(const struct option *opt, const char *arg, int unset)
+static int opt_parse_sort(const struct option *opt, const char *arg, int unset)
{
struct ref_sort **sort_tail = opt->value;
struct ref_sort *s;
diff --git a/builtin-merge.c b/builtin-merge.c
index 8825dcf8d9c4cce3fa0321a808877237d05d4f5a..e78fa18b3a68e2b7f041beab0524ce1a2b7e9365 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
sha1_to_hex(remote_head->sha1), remote);
}
-int git_merge_config(const char *k, const char *v, void *cb)
+static int git_merge_config(const char *k, const char *v, void *cb)
{
if (branch && !prefixcmp(k, "branch.") &&
!prefixcmp(k + 7, branch) &&