]> git.ipfire.org Git - thirdparty/git.git/commit - commit.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 52b9d2c 37576c1)
Merge branch 'nd/war-on-nul-in-commit'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Dec 2011 19:27:26 +0000 (11:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Dec 2011 19:27:26 +0000 (11:27 -0800)
commitf35ccd9be2db9a55afd09ed1a9338c758fa63d82
treec94f3c518cdadb2c478e066547f152d3c753fb36tree | snapshot
parent52b9d2cf7fbde061bf0d3336e3a89d7333d5b23dcommit | diff
parent37576c14439a4dfa43bec5a5c953fea1cc436bbfcommit | diff
Merge branch 'nd/war-on-nul-in-commit'

* 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
builtin/commit-tree.c diff1 | diff2 | blob | history
builtin/commit.c diff1 | diff2 | blob | history
builtin/merge.c diff1 | diff2 | blob | history
builtin/notes.c diff1 | diff2 | blob | history
commit.c diff1 | diff2 | blob | history
commit.h diff1 | diff2 | blob | history
notes-merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.