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

2013-06-28 Thread Junio C Hamano
Sebastian Schuberth writes: > 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

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: [PATCH] Do not call built-in aliases from scripts

2013-06-28 Thread Sebastian Schuberth
On Thu, Jun 27, 2013 at 8:10 PM, Junio C Hamano wrote: >>> Now that I look at it more, I see that >>> `git-mailinfo` was missed and there's a `git-apply` towards the >>> bottom. So I'm not sure it's helping the consistency argument. >> >> Hmph, true. > > Having said that, I'd still prefer to se

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

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

2013-06-27 Thread John Keeping
On Thu, Jun 27, 2013 at 11:05:09AM -0700, Junio C Hamano wrote: > John Szakmeister writes: > > > On Thu, Jun 27, 2013 at 1:27 PM, Junio C Hamano wrote: > > [snip] > >>> diff --git a/git-am.sh b/git-am.sh > >>> index 9f44509..ad67194 100755 > >>> --- a/git-am.sh > >>> +++ b/git-am.sh > >>> @@ -16

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

2013-06-27 Thread Junio C Hamano
Junio C Hamano writes: > John Szakmeister writes: > >> On Thu, Jun 27, 2013 at 1:27 PM, Junio C Hamano wrote: >> [snip] diff --git a/git-am.sh b/git-am.sh index 9f44509..ad67194 100755 --- a/git-am.sh +++ b/git-am.sh @@ -16,8 +16,8 @@ s,signoff add a Signed-off-by

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

2013-06-27 Thread Junio C Hamano
John Szakmeister writes: > On Thu, Jun 27, 2013 at 1:27 PM, Junio C Hamano wrote: > [snip] >>> diff --git a/git-am.sh b/git-am.sh >>> index 9f44509..ad67194 100755 >>> --- a/git-am.sh >>> +++ b/git-am.sh >>> @@ -16,8 +16,8 @@ s,signoff add a Signed-off-by line to the commit >>> message >>

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

2013-06-27 Thread John Szakmeister
On Thu, Jun 27, 2013 at 1:27 PM, Junio C Hamano wrote: [snip] >> diff --git a/git-am.sh b/git-am.sh >> index 9f44509..ad67194 100755 >> --- a/git-am.sh >> +++ b/git-am.sh >> @@ -16,8 +16,8 @@ s,signoff add a Signed-off-by line to the commit >> message >> u,utf8 recode into utf8 (d

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

2013-06-27 Thread Junio C Hamano
Sebastian Schuberth writes: > On Thu, Jun 27, 2013 at 6:11 PM, Junio C Hamano wrote: > >> I vaguely recall that some people may have argued that git-foo is >> one less exec(2) when we left these in our scripted Porcelains, >> though, so on a platform with poorly performing fork/exec, this >> cha

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

2013-06-27 Thread Sebastian Schuberth
On Thu, Jun 27, 2013 at 6:11 PM, Junio C Hamano 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 ship

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

2013-06-27 Thread Junio C Hamano
Sebastian Schuberth writes: > 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 ship the built-in aliases, so do not

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

2013-06-27 Thread Sebastian Schuberth
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 ship the built-in aliases, so do not depend on their presence. Signed-off