summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-28 13:33:37 -0700
committerJunio C Hamano <junkio@cox.net>2007-03-28 13:44:04 -0700
commit542e165cdc4fbebbfe7c8954ca1aa1d4162e38cb (patch)
treef085406239e17030fdfea420a208a3d6e0833096 /merge-tree.c
parent9c880b3ea56a7ff2f66dcf12eb2351f0f51a54ef (diff)
downloadgit-542e165cdc4fbebbfe7c8954ca1aa1d4162e38cb.tar.gz
Fix "--pretty=format:" for parent related items.
There are two breakages in the %P/%p interpolation. It appended an excess SP at the end of the list, and it gave uninitialized contents of a buffer on the stack for root commits. This fixes it, while updating the t6006 test which expected the wrong output. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions