Skip to content

Commit fdb76c1

Browse files
Martin von Zweigbergkgitster
Martin von Zweigbergk
authored and
gitster
committed
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>
1 parent 15a147e commit fdb76c1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,9 +369,6 @@ SCRIPT_SH += git-merge-resolve.sh
369369
SCRIPT_SH += git-mergetool.sh
370370
SCRIPT_SH += git-pull.sh
371371
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
375372
SCRIPT_SH += git-rebase.sh
376373
SCRIPT_SH += git-repack.sh
377374
SCRIPT_SH += git-request-pull.sh
@@ -381,6 +378,9 @@ SCRIPT_SH += git-web--browse.sh
381378

382379
SCRIPT_LIB += git-mergetool--lib
383380
SCRIPT_LIB += git-parse-remote
381+
SCRIPT_LIB += git-rebase--am
382+
SCRIPT_LIB += git-rebase--interactive
383+
SCRIPT_LIB += git-rebase--merge
384384
SCRIPT_LIB += git-sh-setup
385385

386386
SCRIPT_PERL += git-add--interactive.perl

‎git-rebase--interactive.sh‎

100755100644
File mode changed.

0 commit comments

Comments
 (0)