summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-10 18:33:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-10 18:33:13 (GMT)
commit34aacf30a39570e58de7c499f102b7196f2a9744 (patch)
treed9c92904fe01cf7895379b3f2c9582d646ffbd9f /commit.c
parentb2132068c6df38b24b49dfc6fbbf0645b21ec037 (diff)
parent8785b7654bfbdbf718b950e86924753753548ff4 (diff)
downloadgit-34aacf30a39570e58de7c499f102b7196f2a9744.zip
git-34aacf30a39570e58de7c499f102b7196f2a9744.tar.gz
git-34aacf30a39570e58de7c499f102b7196f2a9744.tar.bz2
Merge branch 'nd/commit-tree-constness'
Code clean-up. * nd/commit-tree-constness: commit.c: make "tree" a const pointer in commit_tree*()
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/commit.c b/commit.c
index 5df1df7..5ff5538 100644
--- a/commit.c
+++ b/commit.c
@@ -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[] =
"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)