Skip to content

Commit 16f5bfc

Browse files
committed
Makefile: fix permissions of mergetools/ checked out with permissive umask
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 parents 7f41b6b + 53b7425 commit 16f5bfc

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2291,8 +2291,7 @@ install: all
22912291
$(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)'
22922292
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
22932293
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
2294-
(cd mergetools && $(TAR) cf - .) | \
2295-
(cd '$(DESTDIR_SQ)$(mergetools_instdir_SQ)' && umask 022 && $(TAR) xof -)
2294+
$(INSTALL) -m 644 mergetools/* '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
22962295
ifndef NO_PERL
22972296
$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
22982297
$(MAKE) -C gitweb install

0 commit comments

Comments
 (0)