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

2013-06-28 Thread Johannes Schindelin
Hi Sebastian, On Fri, 28 Jun 2013, Sebastian Schuberth wrote: > On Thu, Jun 27, 2013 at 8:52 PM, Johannes Schindelin > wrote: > > >> --- a/git-merge-octopus.sh > >> +++ b/git-merge-octopus.sh > >> @@ -97,7 +97,7 @@ do > >> if test $? -ne 0 > >> then > >> echo "Simple m

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

2013-06-28 Thread Sebastian Schuberth
On Thu, Jun 27, 2013 at 8:52 PM, Johannes Schindelin wrote: >> --- 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 gi

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

2013-06-27 Thread Johannes Sixt
Am 27.06.2013 14:47, schrieb Sebastian Schuberth: > diff --git a/git-archimport.perl b/git-archimport.perl > index 9cb123a..ed2c741 100755 > --- a/git-archimport.perl > +++ b/git-archimport.perl ... > @@ -477,8 +477,8 @@ sub process_patchset_fast { > unlink @$del; > while (@$del)

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

2013-06-27 Thread Johannes Schindelin
Hi Sebastian, On Thu, 27 Jun 2013, Sebastian Schuberth wrote: > Call built-in commands via the main executable (non-dashed form) without > relying on the aliases (dashed form) to be present. On some platforms, > e.g. those that do not properly support file system links, it is > inconvenient to sh