Re: git + deploy:pending == not working right?

Hi.

I think that most of this patch is a duplicate of a patch (sans tests)
I submitted (now in verified state) earlier this week.  :-)  I also
kept the use of #{git} instead of #{command} for keeping consistent
with the rest of the code.

http://dev.rubyonrails.org/ticket/10515

However, Joe has patched something related to deploy:pending I did not
address and I would suggest he break that out, add some tests, and
apply and verify independently from the other.

Cheers,

Glenn

On Dec 19, 8:00 am, Joe Van Dyk 
<joevan...-Re5JQEeQqe8AvxtiuMwx3w@xxxxxxxxxxxxxxxx> wrote:
> On Dec 19, 7:50 am, Jamis Buck 
> <ja...-uHoyYlH2B+GakBO8gow8eQ@xxxxxxxxxxxxxxxx> wrote:
>
> > Joe,
>
> > Thanks for tracking that down. Any chance I could persuade you to post
> > that patch to trac,http://dev.rubyonrails.com, so that it won't get
> > lost in the shuffle? Thanks!
>
> > - Jamis
>
> http://dev.rubyonrails.org/ticket/10562
>
> > On Dec 19, 2007, at 6:11 AM, Joe Van Dyk wrote:
>
> > > Hi,
>
> > > Doing a cap deploy:pending seems to show me all the commits that are
> > > in the deployed version, not the commits that are between the deployed
> > > version and the HEAD.
>
> > > deploy:pending:diff works as expected though.
>
> > > Also, since my git wasn't in my PATH, I had to change capistrano
> > > slightly to get the git deploy stuff to work:
>
> > > --- git.rb.old  2007-12-18 13:47:26.000000000 -0800
> > > +++ git.rb      2007-12-18 13:49:57.000000000 -0800
> > > @@ -125,12 +125,12 @@ module Capistrano
> > >         # Merges the changes to 'head' since the last fetch, for
> > > remote_cache
> > >         # deployment strategy
> > >         def sync(revision, destination)
> > > -          execute = "cd #{destination} && git fetch origin && "
> > > +          execute = "cd #{destination} && #{command} fetch origin &&
> > > "
>
> > >           if head == 'HEAD'
> > > -            execute += "git merge origin/HEAD"
> > > +            execute += "#{command} merge origin/HEAD"
> > >           else
> > > -            execute += "git merge #{head}"
> > > +            execute += "#{command} merge #{head}"
> > >           end
>
> > >           execute
>
> >  smime.p7s
> > 3KDownload