Browse Source

Merge branch 'nd/commit-tree-constness'

Code clean-up.

* nd/commit-tree-constness:
  commit.c: make "tree" a const pointer in commit_tree*()
maint
Junio C Hamano 11 years ago
parent
commit
34aacf30a3
  1. 4
      commit.c
  2. 4
      commit.h

4
commit.c

@ -1356,7 +1356,7 @@ void free_commit_extra_headers(struct commit_extra_header *extra) @@ -1356,7 +1356,7 @@ void free_commit_extra_headers(struct commit_extra_header *extra)
}
}

int commit_tree(const struct strbuf *msg, unsigned char *tree,
int commit_tree(const struct strbuf *msg, const unsigned char *tree,
struct commit_list *parents, unsigned char *ret,
const char *author, const char *sign_commit)
{
@ -1485,7 +1485,7 @@ static const char commit_utf8_warn[] = @@ -1485,7 +1485,7 @@ static const char commit_utf8_warn[] =
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n";

int commit_tree_extended(const struct strbuf *msg, unsigned char *tree,
int commit_tree_extended(const struct strbuf *msg, const unsigned char *tree,
struct commit_list *parents, unsigned char *ret,
const char *author, const char *sign_commit,
struct commit_extra_header *extra)

4
commit.h

@ -232,11 +232,11 @@ struct commit_extra_header { @@ -232,11 +232,11 @@ struct commit_extra_header {
extern void append_merge_tag_headers(struct commit_list *parents,
struct commit_extra_header ***tail);

extern int commit_tree(const struct strbuf *msg, unsigned char *tree,
extern int commit_tree(const struct strbuf *msg, const unsigned char *tree,
struct commit_list *parents, unsigned char *ret,
const char *author, const char *sign_commit);

extern int commit_tree_extended(const struct strbuf *msg, unsigned char *tree,
extern int commit_tree_extended(const struct strbuf *msg, const unsigned char *tree,
struct commit_list *parents, unsigned char *ret,
const char *author, const char *sign_commit,
struct commit_extra_header *);

Loading…
Cancel
Save