Re: [PATCH] Do not call built-in aliases from scripts

Hi Sebastian,

On Fri, 28 Jun 2013, Sebastian Schuberth wrote:

On Thu, Jun 27, 2013 at 8:52 PM, Johannes Schindelin
[off-list ref] wrote:

quoted

quoted

--- 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 ...

I know. That is what I pointed out. git-merge-one-file was *not*
"un-dashed". And I explained the reason, too.

But if we really want to solve the problem you described earlier, we also
must not rely on git-merge-one-file to be present in libexec.

Ciao,
Dscho

-- 
-- 
*** 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.