On Thu, 24 Feb 2011, Jeff King wrote: > On Thu, Feb 24, 2011 at 03:07:34AM -0500, Jeff King wrote: > > > On Wed, Feb 23, 2011 at 10:27:23PM -0500, Martin von Zweigbergk wrote: > > > > > > > +++ b/git-rebase--merge.sh > > > > > > > > This should be mode 100755. (Ditto for git-rebase--am.sh in 19/31) > > > > > > I was just about to fix now and I noticed that quite a few other > > > script files are mode 100644. Should all be changed to mode 100755 or > > > is there some kind of rule as to which mode they should be? Both > > > git-sh-setup.sh and git-parse-remote.sh are also mode 100644 and I > > > (think I) know that both are always sourced. If the rule is that > > > sourced scripts should be mode 100644 (but I'm just guessing here), > > > then I should actually have changed the mode of > > > git-rebase--interactive.sh to that mode instead. Please advice. > > > > Yes, sourced scripts should not have an executable bit. See 46bac90 for > > rationale. > > And I should have mentioned: they should go in SCRIPT_LIB in the > Makefile, not SCRIPT_SH. Thanks. The below should hopefully fix my mistakes. -- 8< -- Subject: [PATCH] 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@xxxxxxxx> Helped-by: Jeff King <peff@xxxxxxxx> Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@xxxxxxxxx> --- Applies on top of mz/rebase. Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) mode change 100755 => 100644 git-rebase--interactive.sh diff --git a/Makefile b/Makefile index b2501cc..e722b95 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 @@ -382,6 +379,9 @@ SCRIPT_SH += git-web--browse.sh SCRIPT_LIB += git-mergetool--lib SCRIPT_LIB += git-parse-remote SCRIPT_LIB += git-sh-setup +SCRIPT_LIB += git-rebase--am.sh +SCRIPT_LIB += git-rebase--interactive.sh +SCRIPT_LIB += git-rebase--merge.sh SCRIPT_PERL += git-add--interactive.perl SCRIPT_PERL += git-difftool.perl diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh old mode 100755 new mode 100644 -- 1.7.4.1.79.gba571.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html