mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/war-on-nul-in-commit'

Browse Source 
* nd/war-on-nul-in-commit:
  commit_tree(): refuse commit messages that contain NULs
  Convert commit_tree() to take strbuf as message
  merge: abort if fails to commit

Conflicts:
	builtin/commit.c
	commit.c
	commit.h
This commit is contained in:
Junio C Hamano
2011-12-22 11:27:26 -08:00
parent 52b9d2cf7f 37576c1443
commit f35ccd9be2
10 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/commit.c
View File

@ -1492,7 +1492,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
append_merge_tag_headers(parents, &tail);
}
if (commit_tree_extended(sb.buf, active_cache_tree->sha1, parents, sha1,
if (commit_tree_extended(&sb, active_cache_tree->sha1, parents, sha1,
author_ident.buf, extra)) {
rollback_index_files();
die(_("failed to write commit object"));