diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-02-25 03:32:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-25 20:19:41 (GMT) |
| commit | fdb76c104af5196fe1faf6d84209daf752e87010 (patch) | |
| tree | 2e66a2bbdbb90f2275f7563d99b42852cb795320 | |
| parent | 15a147e61898d25ec8b539190e87f3a09592c9c8 (diff) | |
| download | git-fdb76c104af5196fe1faf6d84209daf752e87010.zip git-fdb76c104af5196fe1faf6d84209daf752e87010.tar.gz git-fdb76c104af5196fe1faf6d84209daf752e87010.tar.bz2 | |
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>
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | git-rebase--interactive.sh | 0 |
2 files changed, 3 insertions, 3 deletions
@@ -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 index 6566d31..6566d31 100755..100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh |