diff options
| author | Rene Scharfe <rene.scharfe@lsrfire.ath.cx> | 2006-10-26 18:52:39 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-26 18:31:17 -0700 |
| commit | 2b60356da5369dd60ab26eabaa91d95b6badf209 (patch) | |
| tree | cbbdf8cbe6ef081f5e2d48c5d24d7fe283f443c4 /builtin-log.c | |
| parent | e827633a5d7d627eb1170b2d0c71e944d0d56faf (diff) | |
| download | git-2b60356da5369dd60ab26eabaa91d95b6badf209.tar.gz git-2b60356da5369dd60ab26eabaa91d95b6badf209.tar.xz | |
Make git-cherry handle root trees
This patch on top of 'next' makes built-in git-cherry handle root
commits.
It moves the static function log-tree.c::diff_root_tree() to
tree-diff.c and makes it more similar to diff_tree_sha1() by
shuffling around arguments and factoring out the call to
log_tree_diff_flush(). Consequently the name is changed to
diff_root_tree_sha1(). It is a version of diff_tree_sha1() that
compares the empty tree (= root tree) against a single 'real' tree.
This function is then used in get_patch_id() to compute patch IDs
for initial commits instead of SEGFAULTing, as the current code
does if confronted with parentless commits.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-log.c')
| -rw-r--r-- | builtin-log.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin-log.c b/builtin-log.c index fc5e47606..fedb0137b 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -171,8 +171,11 @@ static void reopen_stdout(struct commit *commit, int nr, int keep_subject) static int get_patch_id(struct commit *commit, struct diff_options *options, unsigned char *sha1) { - diff_tree_sha1(commit->parents->item->object.sha1, commit->object.sha1, - "", options); + if (commit->parents) + diff_tree_sha1(commit->parents->item->object.sha1, + commit->object.sha1, "", options); + else + diff_root_tree_sha1(commit->object.sha1, "", options); diffcore_std(options); return diff_flush_patch_id(options, sha1); } |