diff options
| author | René Scharfe <l.s.r@web.de> | 2014-07-10 13:41:40 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-11 01:07:16 +0400 |
| commit | 910a09a7350a556f7f367680294fca8d05ddc5f5 (patch) | |
| tree | a3f0b318ca90de936a002d682412319ec58655b3 /commit.c | |
| parent | 294b2680cd89234618e329e090b68dc69cc41a37 (diff) | |
merge: simplify merge_trivial() by using commit_list_append()
Build the commit_list of parents by calling commit_list_append() twice
instead of allocating and linking the items by hand. This makes the
code shorter and simpler. Rename the commit_list from parent to parents
(plural) while at it because there are two of them.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions