Merge branch 'jk/robustify-parse-commit'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2013 20:54:01 +0000 (12:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2013 20:54:01 +0000 (12:54 -0800)
* jk/robustify-parse-commit:
checkout: do not die when leaving broken detached HEAD
use parse_commit_or_die instead of custom message
use parse_commit_or_die instead of segfaulting
assume parse_commit checks for NULL commit
assume parse_commit checks commit->object.parsed
log_tree_diff: die when we fail to parse a commit

14 files changed:
1  2 
builtin/blame.c
builtin/branch.c
builtin/checkout.c
builtin/commit.c
builtin/fast-export.c
builtin/name-rev.c
builtin/show-branch.c
commit.c
commit.h
fetch-pack.c
log-tree.c
sha1_name.c
shallow.c
upload-pack.c
diff --cc builtin/blame.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc commit.c
Simple merge
diff --cc commit.h
Simple merge
diff --cc fetch-pack.c
Simple merge
diff --cc log-tree.c
Simple merge
diff --cc sha1_name.c
Simple merge
diff --cc shallow.c
Simple merge
diff --cc upload-pack.c
Simple merge