Imported Upstream version 2.29.1

diff --git a/Documentation/RelNotes/2.29.1.txt b/Documentation/RelNotes/2.29.1.txt
new file mode 100644 (file)
index 0000000..295ee21
--- /dev/null
+++ b/Documentation/RelNotes/2.29.1.txt
@@ -0,0 +1,11 @@
+Git v2.29.1 Release Notes
+=========================
+
+This is to fix the build procedure change in 2.28 where we failed to
+install a few programs that should be installed in /usr/bin (namely,
+receive-pack, upload-archive and upload-pack) when the non-default
+SKIP_DASHED_BUILT_INS installation option is in effect.
+
+A minor glitch in a non-default installation may usually not deserve
+a hotfix, but I know Git for Windows ship binaries built with this
+option, so let's make an exception.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b6b9c11..eee57d9 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.29.0
+DEF_VER=v2.29.1
 
 LF='
 '

diff --git a/Makefile b/Makefile
index 95571ee..1fb0ec1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2981,15 +2981,12 @@ endif
        } && \
        for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
                $(RM) "$$bindir/$$p" && \
-               if test -z "$(SKIP_DASHED_BUILT_INS)"; \
-               then \
-                       test -n "$(INSTALL_SYMLINKS)" && \
-                       ln -s "git$X" "$$bindir/$$p" || \
-                       { test -z "$(NO_INSTALL_HARDLINKS)" && \
-                         ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
-                         ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
-                         cp "$$bindir/git$X" "$$bindir/$$p" || exit; }; \
-               fi \
+               test -n "$(INSTALL_SYMLINKS)" && \
+               ln -s "git$X" "$$bindir/$$p" || \
+               { test -z "$(NO_INSTALL_HARDLINKS)" && \
+                 ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
+                 ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
+                 cp "$$bindir/git$X" "$$bindir/$$p" || exit; }; \
        done && \
        for p in $(BUILT_INS); do \
                $(RM) "$$execdir/$$p" && \

diff --git a/RelNotes b/RelNotes
index 9143650..5e9b843 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.29.0.txt
\ No newline at end of file
+Documentation/RelNotes/2.29.1.txt
\ No newline at end of file