* --trust-exit-code not working
@ 2014-11-14 16:12 Adria Farres
2014-11-14 20:41 ` Junio C Hamano
2014-11-14 21:55 ` David Aguilar
0 siblings, 2 replies; 5+ messages in thread
From: Adria Farres @ 2014-11-14 16:12 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: --trust-exit-code not working
2014-11-14 16:12 --trust-exit-code not working Adria Farres
@ 2014-11-14 20:41 ` Junio C Hamano
2014-11-14 21:07 ` David Aguilar
2014-11-14 21:55 ` David Aguilar
1 sibling, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2014-11-14 20:41 UTC (permalink / raw)
To: David Aguilar; +Cc: git, Adria Farres
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:
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: --trust-exit-code not working
2014-11-14 20:41 ` Junio C Hamano
@ 2014-11-14 21:07 ` David Aguilar
0 siblings, 0 replies; 5+ messages in thread
From: David Aguilar @ 2014-11-14 21:07 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Adria Farres
On Fri, Nov 14, 2014 at 12:41:16PM -0800, Junio C Hamano wrote:
> 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.
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: --trust-exit-code not working
2014-11-14 16:12 --trust-exit-code not working Adria Farres
2014-11-14 20:41 ` Junio C Hamano
@ 2014-11-14 21:55 ` David Aguilar
1 sibling, 0 replies; 5+ messages in thread
From: David Aguilar @ 2014-11-14 21:55 UTC (permalink / raw)
To: Adria Farres; +Cc: git, Junio C Hamano
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.
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* --trust-exit-code not working
@ 2014-11-08 17:23 Adri Farr
0 siblings, 0 replies; 5+ messages in thread
From: Adri Farr @ 2014-11-08 17:23 UTC (permalink / raw)
To: git
Hello!,
Firstly, thank you very much to those that contributed the patch; I
truly appreciate it. I haven't been able to make it work in 2.2.0.rc1,
though. I'm not sure whether it's my fault, or the patch', but a 'git
difftool --trust-exit-code' call with vimdiff as the diff tool and
exiting with :cq doesn't seem to make it quit. git simply keeps
pushing files to be diffed. Similarly, if I set meld as the tool and
kill it, git will reopen meld with new files.
Sorry for bringing that up so late; I've been fairly busy. I did test
it some days ago and didn't manage to make it work, either.
Thank you,
Adria
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-11-14 21:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-14 16:12 --trust-exit-code not working Adria Farres
2014-11-14 20:41 ` Junio C Hamano
2014-11-14 21:07 ` David Aguilar
2014-11-14 21:55 ` David Aguilar
-- strict thread matches above, loose matches on Subject: below --
2014-11-08 17:23 Adri Farr
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.