Skip to contentSkip to conversation

--trust-exit-code not working

DISCUSSION Adria Farres 3 participants 4 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

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

#1 lore raw

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.

Quoted 18 lines · Adria Farres

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

#2 lore raw
Quoted 5 lines · Junio C Hamano

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.

Quoted 20 lines
Quoted 18 lines · Adria Farres

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

Signature · 1 line
David
#3 lore raw
In reply to Adria Farres
Quoted 4 lines · Adria Farres

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.

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

Quoted 5 lines

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,

Signature · 1 line
David