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. > > +SCRIPT_LIB_SH += git-mergetool--lib.sh > > +SCRIPT_LIB_SH += git-parse-remote.sh > > +SCRIPT_LIB_SH += git-sh-setup.sh > > + ... > > @@ -1792,6 +1802,7 @@ install: all > > $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' > > $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' > > $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' > > + $(INSTALL) -m 644 $(SCRIPT_LIB_SH) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' > > I can understand that you didn't want to include the "included scriptlets" > as part of ALL_PROGRAMS because $(INSTALL) may flip 'x' bit on. > > But you should then be installing %(patsubst %.sh,%,$(SCRIPT_LIB_SH)); > otherwise, you are installing git-sh-setup.sh and > > . git-sh-setup > > would not work. Have you ever tested this? Good catches, sorry. :( I did test but clearly I was not thinking very well when I looked at the result... > Wouldn't it make a bit more sense to do it like this instead? Yes, that looks right. Thanks for cleaning up my mess! Sorry for the trouble, 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