SKIP_DASHED_BUILT_INS: do not skip the bin/ programs
The idea of the `SKIP_DASHED_BUILT_INS` option is to stop hard-linking the built-in commands as separate executables. The patches to do that specifically excluded the three commands `receive-pack`, `upload-archive` and `upload-pack`, though: these commands are expected to be present in the `PATH` in their dashed form on the server side of any fetch/push. However, due to an oversight by myself, even if those commands were still hard-linked, they were not installed into `bin/`. Noticed-by: Michael Forney <mforney@mforney.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Oct 21, 2020 at 15:13 UTC
907e6379d0af4c5412b73dd2f3799ecc634cf059
1 file changed
+6
-9
Makefile
+6
-9
@@ -2981,15 +2981,12 @@ endif
2981
} && \
2982
for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
2983
$(RM) "$$bindir/$$p" && \
2984
- if test -z "$(SKIP_DASHED_BUILT_INS)"; \
2985
- then \
2986
- test -n "$(INSTALL_SYMLINKS)" && \
2987
- ln -s "git$X" "$$bindir/$$p" || \
2988
- { test -z "$(NO_INSTALL_HARDLINKS)" && \
2989
- ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
2990
- ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
2991
- cp "$$bindir/git$X" "$$bindir/$$p" || exit; }; \
2992
- fi \
2984
+ test -n "$(INSTALL_SYMLINKS)" && \
2985
+ ln -s "git$X" "$$bindir/$$p" || \
2986
+ { test -z "$(NO_INSTALL_HARDLINKS)" && \
2987
+ ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
2988
+ ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
2989
+ cp "$$bindir/git$X" "$$bindir/$$p" || exit; }; \
2990
done && \
2991
for p in $(BUILT_INS); do \
2992
$(RM) "$$execdir/$$p" && \