threads / discuss / 37964

--trust-exit-code not working

Subject: --trust-exit-code not working

## tl;dr

4 messages between Nov 14, 2014 and Nov 14, 2014.

replies: 3people: 3as markdown or json

Adria Farres· Nov 14, 2014, 16:12 UTC · lore

Hello!,

I sent an email last week, but I'm not sure if I sent it incorrectly, or the formatting was very bad, or it went unnoticed. A few days ago a great soul was kind enough to create the --trust-exit-code option that made git respect the exit code of the difftool. Unfortunately, I haven't been able to make it work. Exiting vimdiff with :cq doesn't seem to make git quit, as it keeps pushing new files to be diffed. I tried meld and the exact same thing. I'm confident that exiting with :cq gives an error, as I have checked it, and I'm using git 2.2.0.rc1.

Am I missing something important? Has anyone managed to make it work with vimdiff and meld? Sorry for bringing that up so late and for being a disturbance.

Thank you,

Adria

Junio C Hamano· Nov 14, 2014, 20:41 UTC · re: Adria Farres · lore

Re: --trust-exit-code not working

David, I think this is about your 2b52123f (difftool: add support for --trust-exit-code, 2014-10-26). If you have time can you help Adria?

Thanks.

Adria Farres <14farresa@gmail.com> writes:

Show 18 quoted lines

> Hello!,
>
> I sent an email last week, but I'm not sure if I sent it incorrectly, or the
> formatting was very bad, or it went unnoticed. A few days ago a great soul was
> kind enough to create the --trust-exit-code option that made git respect the
> exit code of the difftool. Unfortunately, I haven't been able to make it work.
> Exiting vimdiff with :cq doesn't seem to make git quit, as it keeps pushing new
> files to be diffed. I tried meld and the exact same thing. I'm confident that
> exiting with :cq gives an error, as I have checked it, and I'm using git
> 2.2.0.rc1.
>
> Am I missing something important? Has anyone managed to make it work with
> vimdiff and meld? Sorry for bringing that up so late and for being a
> disturbance.
>
> Thank you,
>
> Adria

David Aguilar· Nov 14, 2014, 21:07 UTC · re: Junio C Hamano · lore

Re: --trust-exit-code not working

On Fri, Nov 14, 2014 at 12:41:16PM -0800, Junio C Hamano wrote:

Show 5 quoted lines

> David, I think this is about your 2b52123f (difftool: add support
> for --trust-exit-code, 2014-10-26).  If you have time can you help
> Adria?
> 
> Thanks.

Yup, I'll take a look when I have a chance. My first guess would be that the vim scriptlet is not passing down the status, but I'll have to take a closer look.

FWIW, I thought I had actually tested using vim, but I'll re-test and verify.

Show 20 quoted lines

> Adria Farres <14farresa@gmail.com> writes:
> 
> > Hello!,
> >
> > I sent an email last week, but I'm not sure if I sent it incorrectly, or the
> > formatting was very bad, or it went unnoticed. A few days ago a great soul was
> > kind enough to create the --trust-exit-code option that made git respect the
> > exit code of the difftool. Unfortunately, I haven't been able to make it work.
> > Exiting vimdiff with :cq doesn't seem to make git quit, as it keeps pushing new
> > files to be diffed. I tried meld and the exact same thing. I'm confident that
> > exiting with :cq gives an error, as I have checked it, and I'm using git
> > 2.2.0.rc1.
> >
> > Am I missing something important? Has anyone managed to make it work with
> > vimdiff and meld? Sorry for bringing that up so late and for being a
> > disturbance.
> >
> > Thank you,
> >
> > Adria

-- 
David

David Aguilar· Nov 14, 2014, 21:55 UTC · re: Adria Farres · lore

Re: --trust-exit-code not working

On Fri, Nov 14, 2014 at 05:12:35PM +0100, Adria Farres wrote:

> Hello!,
> 
> I sent an email last week, but I'm not sure if I sent it incorrectly, or the
> formatting was very bad, or it went unnoticed. A few days ago a great soul was

Nah, I was just very busy and it slipped through the cracks. Sorry 'bout that ~ I was meaning to get back to it.

Show 12 quoted lines

> kind enough to create the --trust-exit-code option that made git respect the
> exit code of the difftool. Unfortunately, I haven't been able to make it work.
> Exiting vimdiff with :cq doesn't seem to make git quit, as it keeps pushing new
> files to be diffed. I tried meld and the exact same thing. I'm confident that
> exiting with :cq gives an error, as I have checked it, and I'm using git
> 2.2.0.rc1.
> 
> Am I missing something important? Has anyone managed to make it work with
> vimdiff and meld? Sorry for bringing that up so late and for being a
> disturbance.
> 
> Thank you,

Thanks for testing, Adria.

If you could test my new patch we would very much appreciate it; adding a Tested-by: attribution line to the commit with your name would be very nice.

cheers,

-- 
David