Package: git
Version: 1:1.7.2.3-2
Severity: important
I've been investigating a merge bug in an unusually large Git repository
with over ten thousand commits.
In older versions of the git-core package (the one in stable),
attempting to merge would raise a segmentation fault. In the latest
version from sid a slightly more useful error message is produced:
BUG: There are unmerged index entries:
BUG: 2 [ ... snip file paths ...] Bug in merge-recursive.c
The bug seems so have been fixed in the latest version of Git from
upstream (1.7.3.1) so I'm guessing once you update to that or a higher
version everything will be fine.
-- System Information:
Kernel: Linux 2.6.24-22-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB, LC_CTYPE=en_GB (charmap=ISO-8859-1)
Shell: /bin/sh linked to /bin/dash
-- no debconf information
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
