From: Andy Lester <andy@xxxxxxxxxxxx>
---
builtin-show-branch.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin-show-branch.c b/builtin-show-branch.c
index 828e6f8..549f99a 100644
--- a/builtin-show-branch.c
+++ b/builtin-show-branch.c
@@ -261,7 +261,6 @@ static void show_one_commit(struct commit *commit, int no_name)
{
struct strbuf pretty = STRBUF_INIT;
const char *pretty_str = "(unavailable)";
- struct commit_name *name = commit->util;
if (commit->object.parsed) {
pretty_print_commit(CMIT_FMT_ONELINE, commit,
@@ -272,6 +271,7 @@ static void show_one_commit(struct commit *commit, int no_name)
pretty_str += 8;
if (!no_name) {
+ struct commit_name *name = commit->util;
if (name && name->head_name) {
printf("[%s", name->head_name);
if (name->generation) {
@@ -456,7 +456,7 @@ static void snarf_refs(int head, int remotes)
}
}
-static int rev_is_head(char *head, int headlen, char *name,
+static int rev_is_head(const char *head, int headlen, const char *name,
unsigned char *head_sha1, unsigned char *sha1)
{
if ((!head[0]) ||
@@ -548,7 +548,7 @@ static int git_show_branch_config(const char *var, const char *value, void *cb)
return git_default_config(var, value, cb);
}
-static int omit_in_dense(struct commit *commit, struct commit **rev, int n)
+static int omit_in_dense(const struct commit *commit, struct commit **rev, int n)
{
/* If the commit is tip of the named branches, do not
* omit it.
--
1.6.2.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html