On 2020-11-17 15:17:44, Jonathan Nieder wrote: > Antoine Beaupré wrote: >> On 2017-09-28 12:37:38, Jack Bates wrote: > >>> I think the following will resolve this, by running the diff-highlight >>> Makefile when the package is built (following the pattern in >>> debian/rules for other contrib things): >>> >>>> diff --git a/debian/rules b/debian/rules >>>> index f132a2605..ea018298b 100755 >>>> --- a/debian/rules >>>> +++ b/debian/rules >>>> @@ -58,6 +58,7 @@ build-stamp: >>>> override_dh_auto_build-arch: build-stamp >>>> $(MAKE) -C contrib/subtree all $(OPTS) >>>> ln -s contrib/subtree/git-subtree >>>> + $(MAKE) -C contrib/diff-highlight $(OPTS) >>>> >>>> override_dh_auto_test-arch: >>>> test -z '$(TEST)' || \ >> >> Any reason why this hasn't been applied to the package just yet? >> >> I'd be happy to do that in a NMU if there are no objections... > > Please don't. Adding additional contrib/ code to the supported > surface without coordination is not an NMU I'd welcome at all > (instead, it would be a bit of a rude shock).
Happy to discuss it further. ;) It's why I wrote this, after all.. I wouldn't NMU without first asking, obviously. > Would it make sense to install this to /usr/share/git-core/contrib/? Sure, that's a good start. > If not, could it go in a separate package (within the same source > package)? That could be nice as well. Either way, having some way for users to enable it would be nice. From what I understand, it actually used to ship in the package and that changed with upstream changes so it would be nice to restore that... > I'm also curious about how this compares to > https://pypi.org/project/diff-highlight/ No idea. a. -- Wire telegraph is a kind of a very, very long cat. You pull his tail in New York and his head is meowing in Los Angeles. Radio operates exactly the same way: you send signals here, they receive them there. The only difference is that there is no cat. - Albert Einstein [apocryphal]
