Junio C Hamano wrote: > Jonathan Nieder <jrnieder@xxxxxxxxx> writes: > >> Junio C Hamano wrote: >> >>> How much would it hurt the distro packagers, if we don't take this patch >>> before 1.7.0? If this would help a lot, let's give it a bit higher >>> priority and make sure 1.7.0 ships with (a corrected version of) it; >>> otherwise I'd say we should not merge this before 1.7.0. >> >> Given that Peff’s fix is in, I don’t think it is needed at all. So I >> would say, better to let it wait. > > I was referring to this from your original: > > It was also confusing dpkg-shlibdeps, so I recently came up with > this fix. Both fixes seem like good changes to me, and both > could be applied. Your fix has the virtue of being shorter, > hence safer. > > Is Jeff's mergetool-lib change enough to address this issue as well? I just checked; looks like I was confusing a few issues. - dpkg-shlibdeps does not like to be fed scripts, period. That has nothing to do with this. - debian/rules in the git-core package feeds every file in /usr/bin and gitexecdir that doesn’t start with #! to 'strip'. Jeff's change helps that; my fix has nothing to do with it. - some other tool must have been happier with these files not being executable, but I cannot reproduce this or find it now. I wrote that patch late at night, and unfortunately, I cannot justify it to myself now. With Jeff’s change applied, there is no obvious breakage that it fixes. If a problem comes up again, I will let you know. Embarrassed, Jonathan -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html