| commit | 910a09a7350a556f7f367680294fca8d05ddc5f5 | |
| author | René Scharfe <l.s.r@web.de> | |
| Thu, 10 Jul 2014 09:41:40 +0000 (10 11:41 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Jul 2014 21:07:16 +0000 (10 14:07 -0700) | ||
| tree | a3f0b318ca90de936a002d682412319ec58655b3 | treesnapshot (tar.gz zip) |
| parent | 294b2680cd89234618e329e090b68dc69cc41a37 | commitdiff |
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>
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>
| builtin/merge.c | diffblobblamehistory |