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 <j6t@kdbg.org> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Martin von Zweigbergk committed
Feb 24, 2011 at 22:32 UTC
fdb76c104af5196fe1faf6d84209daf752e87010
2 files changed
+3
-3
Makefile
+3
-3
@@ -369,9 +369,6 @@ SCRIPT_SH += git-merge-resolve.sh
369
SCRIPT_SH += git-mergetool.sh
370
SCRIPT_SH += git-pull.sh
371
SCRIPT_SH += git-quiltimport.sh
372
-SCRIPT_SH += git-rebase--am.sh
373
-SCRIPT_SH += git-rebase--interactive.sh
374
-SCRIPT_SH += git-rebase--merge.sh
372
SCRIPT_SH += git-rebase.sh
373
SCRIPT_SH += git-repack.sh
374
SCRIPT_SH += git-request-pull.sh
@@ -381,6 +378,9 @@ SCRIPT_SH += git-web--browse.sh
378
379
SCRIPT_LIB += git-mergetool--lib
380
SCRIPT_LIB += git-parse-remote
381
+SCRIPT_LIB += git-rebase--am
382
+SCRIPT_LIB += git-rebase--interactive
383
+SCRIPT_LIB += git-rebase--merge
384
SCRIPT_LIB += git-sh-setup
385
386
SCRIPT_PERL += git-add--interactive.perl