From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 Sep 2015 21:59:05 +0000 (-0700)
Subject: Merge branch 'sg/help-group'
X-Git-Tag: v2.6.0-rc3~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a9400b01dfc2256ae6e2c3bd3671519188a3a467?hp=153ec926b6ec4ac41f7fdfbca705a3afaa7ef192

Merge branch 'sg/help-group'

* sg/help-group:
Makefile: use SHELL_PATH when running generate-cmdlist.sh
---

diff --git a/Makefile b/Makefile
index e326fa09c0..8d5df7ea1e 100644
--- a/Makefile
+++ b/Makefile
@@ -1703,7 +1703,7 @@ $(BUILT_INS): git$X
 common-cmds.h: generate-cmdlist.sh command-list.txt
 
 common-cmds.h: $(wildcard Documentation/git-*.txt)
-	$(QUIET_GEN)./generate-cmdlist.sh command-list.txt >$@+ && mv $@+ $@
+	$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh command-list.txt >$@+ && mv $@+ $@
 
 SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
 	$(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\