From: Martin von Zweigbergk Date: Fri, 25 Feb 2011 03:32:06 +0000 (-0500) Subject: Makefile: do not install sourced rebase scripts X-Git-Tag: v1.7.6-rc0~136^2~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fdb76c104af5196fe1faf6d84209daf752e87010;p=git.git Makefile: do not install sourced rebase scripts When git-rebase.sh recently started sourcing git-rebase--interactive.sh instead of executing it, executable bit of the latter file should have been turned off and it should have been moved from SCRIPT_SH to SCRIPT_LIB in the Makefile. Its two new siblings, git-rebase--am.sh and git-rebase--merge.sh (whose executable bits are already off) should also be moved to SCRIPT_LIB in the Makefile. Reported-by: Johannes Sixt Helped-by: Jeff King Signed-off-by: Martin von Zweigbergk Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index b2501cc03..acde60aab 100644 --- a/Makefile +++ b/Makefile @@ -369,9 +369,6 @@ SCRIPT_SH += git-merge-resolve.sh SCRIPT_SH += git-mergetool.sh SCRIPT_SH += git-pull.sh SCRIPT_SH += git-quiltimport.sh -SCRIPT_SH += git-rebase--am.sh -SCRIPT_SH += git-rebase--interactive.sh -SCRIPT_SH += git-rebase--merge.sh SCRIPT_SH += git-rebase.sh SCRIPT_SH += git-repack.sh SCRIPT_SH += git-request-pull.sh @@ -381,6 +378,9 @@ SCRIPT_SH += git-web--browse.sh SCRIPT_LIB += git-mergetool--lib SCRIPT_LIB += git-parse-remote +SCRIPT_LIB += git-rebase--am +SCRIPT_LIB += git-rebase--interactive +SCRIPT_LIB += git-rebase--merge SCRIPT_LIB += git-sh-setup SCRIPT_PERL += git-add--interactive.perl diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh old mode 100755 new mode 100644