undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: always provide a fallback when hardlinks fail

Browse Source 
We make hardlinks from "git" to "git-<cmd>" built-ins and have been
careful to avoid cross-device links when linking "git-<cmd>" to
gitexecdir.

However, we were not prepared to deal with a build directory that is
incapable of making hard links within itself. This patch corrects it.

Instead of temporarily linking "git" to gitexecdir, directly link "git-
add", falling back to "cp". Try hardlinking that as "git-<cmd>", falling
back to symlinks or "cp" on error.

While at it, avoid 100+ error messages from hardlink failures when we are
going to fall back to symlinks or "cp" by redirecting the standard error
to /dev/null.

Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Andreas Färber 2008-08-25 17:33:03 +02:00 committed by Junio C Hamano
parent 5760a6b094
commit 3e073dc561
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -1099,7 +1099,10 @@ help.o: help.c common-cmds.h GIT-CFLAGS
'-DGIT_INFO_PATH="$(infodir_SQ)"' $< '-DGIT_INFO_PATH="$(infodir_SQ)"' $<
$(BUILT_INS): git$X $(BUILT_INS): git$X
$(QUIET_BUILT_IN)$(RM) $@ && ln git$X $@ $(QUIET_BUILT_IN)$(RM) $@ && \
ln git$X $@ 2>/dev/null || \
ln -s git$X $@ 2>/dev/null || \
cp git$X $@
common-cmds.h: ./generate-cmdlist.sh command-list.txt common-cmds.h: ./generate-cmdlist.sh command-list.txt
@ -1364,16 +1367,13 @@ ifneq (,$X)
endif endif
bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \ bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \ execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
if test "z$$bindir" != "z$$execdir"; \ { $(RM) "$$execdir/git-add$X" && \
then \ ln git-add$X "$$execdir/git-add$X" 2>/dev/null || \
ln -f "$$bindir/git$X" "$$execdir/git$X" || \ cp git-add$X "$$execdir/git-add$X"; } && \
cp "$$bindir/git$X" "$$execdir/git$X"; \ { $(foreach p,$(filter-out git-add,$(BUILT_INS)), $(RM) "$$execdir/$p" && \
fi && \ ln "$$execdir/git-add$X" "$$execdir/$p" 2>/dev/null || \
{ $(foreach p,$(BUILT_INS), $(RM) "$$execdir/$p" && ln "$$execdir/git$X" "$$execdir/$p" ;) } && \ ln -s "git-add$X" "$$execdir/$p" 2>/dev/null || \
if test "z$$bindir" != "z$$execdir"; \ cp "$$execdir/git-add$X" "$$execdir/$p" || exit;) } && \
then \
$(RM) "$$execdir/git$X"; \
fi && \
./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X" ./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
install-doc: install-doc: