Skip to content

Commit 2e67335

Browse files
committed
Sync with Git 2.29.1
2 parents 69986e1 + b927c80 commit 2e67335

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

Documentation/RelNotes/2.29.1.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Git v2.29.1 Release Notes
2+
=========================
3+
4+
This is to fix the build procedure change in 2.28 where we failed to
5+
install a few programs that should be installed in /usr/bin (namely,
6+
receive-pack, upload-archive and upload-pack) when the non-default
7+
SKIP_DASHED_BUILT_INS installation option is in effect.
8+
9+
A minor glitch in a non-default installation may usually not deserve
10+
a hotfix, but I know Git for Windows ship binaries built with this
11+
option, so let's make an exception.

GIT-VERSION-GEN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
GVF=GIT-VERSION-FILE
4-
DEF_VER=v2.29.0
4+
DEF_VER=v2.29.GIT
55

66
LF='
77
'

Makefile

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2981,15 +2981,12 @@ endif
29812981
} && \
29822982
for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
29832983
$(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; }; \
29932990
done && \
29942991
for p in $(BUILT_INS); do \
29952992
$(RM) "$$execdir/$$p" && \

RelNotes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Documentation/RelNotes/2.29.0.txt
1+
Documentation/RelNotes/2.29.1.txt

0 commit comments

Comments
 (0)