summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2014-07-10 09:41:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-10 21:07:16 (GMT)
commit910a09a7350a556f7f367680294fca8d05ddc5f5 (patch)
treea3f0b318ca90de936a002d682412319ec58655b3 /commit.c
parent294b2680cd89234618e329e090b68dc69cc41a37 (diff)
downloadgit-910a09a7350a556f7f367680294fca8d05ddc5f5.zip
git-910a09a7350a556f7f367680294fca8d05ddc5f5.tar.gz
git-910a09a7350a556f7f367680294fca8d05ddc5f5.tar.bz2
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