Merge master.kernel.org:/home/hpa/git/daemon

diff --git a/Makefile b/Makefile
index d18153de5d5328bbf40bc9c813c36a43835aba23..9920467d9060a434e96a38136bf3caf56c19ca8d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -116,6 +116,7 @@ PROGRAMS = \
        git-ssh-upload git-tar-tree git-unpack-file \
        git-unpack-objects git-update-index git-update-server-info \
        git-upload-pack git-verify-pack git-write-tree \
+       git-update-ref \
        $(SIMPLE_PROGRAMS)
 
 # Backward compatibility -- to be removed in 0.99.8
@@ -252,7 +253,7 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
          $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
          gitk
 
-export TAR INSTALL DESTDIR
+export TAR INSTALL DESTDIR SHELL_PATH
 ### Build rules
 
 all: $(PROGRAMS) $(SCRIPTS)