Re: [PATCH 1/2] Avoid using the git wrapper in git-rebase.sh.
- From
Junio C Hamano <junkio@cox.net>
- Date
- Jul 14, 2006, 16:26 UTC
- Message-ID
- <7vpsg8qhj9.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <20060714044655.GA1982@spearce.org>
Shawn Pearce <spearce@spearce.org> writes:
> Ideally 'shipped' commands (e.g. git-rebase) should avoid calling > the git wrapper when executing other commands to prevent the user > from shadowing those commands with aliases and causing the shipped > command behavior to differ unexpectedly.
In order to avoid confusion, we made aliases not to shadow real commands, so this is not an argument to support this patch.
On distros that package git with gitexecdir set to somewhere not on normal user $PATH, users are expected to use "git" wrapper to invoke any commands (including git-rebase, so the user would say "git rebase"), and "git" wrapper sets up the PATH to contain the gitexecdir while it runs the subcommands, so spelling them either way, be it "git am" or "git-am", is just fine.
Show 19 quoted lines
> > Signed-off-by: Shawn O. Pearce <spearce@spearce.org> > --- > git-rebase.sh | 12 ++++++------ > 1 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/git-rebase.sh b/git-rebase.sh > index 1b9e986..6d06665 100755 > --- a/git-rebase.sh > +++ b/git-rebase.sh > @@ -131,7 +131,7 @@ do > finish_rb_merge > exit > fi > - git am --resolved --3way --resolvemsg="$RESOLVEMSG" > + git-am --resolved --3way --resolvemsg="$RESOLVEMSG" > exit > ;; > --skip)