git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 294b268)
merge: simplify merge_trivial() by using commit_list_append()
authorRené Scharfe <redacted>
Thu, 10 Jul 2014 09:41:40 +0000 (11:41 +0200)
committerJunio C Hamano <redacted>
Thu, 10 Jul 2014 21:07:16 +0000 (14:07 -0700)
commit910a09a7350a556f7f367680294fca8d05ddc5f5
treea3f0b318ca90de936a002d682412319ec58655b3tree | snapshot
parent294b2680cd89234618e329e090b68dc69cc41a37commit | 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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/merge.c diff | blob | history
git clone https://git.99rst.org/PROJECT