Re: [PATCH] Do not call built-in aliases from scripts
- From
Sebastian Schuberth <sschuberth@gmail.com>
- Date
- Jun 28, 2013, 20:23 UTC
- Message-ID
- <CAHGBnuOE6vYzM2bKs2SV1qJVoCOX=t-XWnd_Xbs1JRD+sY4dVQ@mail.gmail.com>
- In-Reply-To
- <alpine.DEB.1.00.1306272030291.28957@s15462909.onlinehome-server.info>
On Thu, Jun 27, 2013 at 8:52 PM, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
Show 14 quoted lines
>> --- a/git-merge-octopus.sh >> +++ b/git-merge-octopus.sh >> @@ -97,7 +97,7 @@ do >> if test $? -ne 0 >> then >> echo "Simple merge did not work, trying automatic merge." >> - git-merge-index -o git-merge-one-file -a || >> + git merge-index -o git-merge-one-file -a || > > This is a problem. 'git-merge-one-file' cannot be split here AFAICT. > > Of course, we could teach merge-index to read *two* parameters instead of > one when it encounters "git" as the <merge-program>. But that would be as > hacky as the whole dashed-form business to begin with.
I agree to all of your comments except this one: I did not split 'git-merge-one-file' here ...
Show 12 quoted lines
>> diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh >> index c9da747..343fe7b 100755 >> --- a/git-merge-resolve.sh >> +++ b/git-merge-resolve.sh >> @@ -45,7 +45,7 @@ then >> exit 0 >> else >> echo "Simple merge failed, trying Automatic merge." >> - if git-merge-index -o git-merge-one-file -a >> + if git merge-index -o git-merge-one-file -a > > As above, with -octopus.
Sorry, I can't follow you here.
-- Sebastian Schuberth -- -- *** Please reply-to-all at all times *** *** (do not pretend to know who is subscribed and who is not) *** *** Please avoid top-posting. *** The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free. You received this message because you are subscribed to the Google Groups "msysGit" group. To post to this group, send email to msysgit@googlegroups.com To unsubscribe from this group, send email to msysgit+unsubscribe@googlegroups.com For more options, and view previous threads, visit this group at http://groups.google.com/group/msysgit?hl=en_US?hl=en --- You received this message because you are subscribed to the Google Groups "msysGit" group. To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.