From: Antoine Pelisse <apelisse@gmail.com>
Date: Wed, 27 Nov 2013 16:38:46 GMT
Subject: Re: How to pre-empt git pull merge error?
Message-ID: <CALWbr2wNODeLSmQ5ztQmKVxBSguNJ1bbSbvY66sdsP09dSUUgA@mail.gmail.com>
In-Reply-To: <vpq8uw9q1r4.fsf@anie.imag.fr>

>> On Wed, 27 Nov 2013 15:17:27 +0000
>> Pete Forman <petef4+usenet@gmail.com> wrote:
>>
>>> I am looking for a way of detecting up front whether a git pull or git
>>> merge would fail. The sort of script I want to perform is to update a
>>> server.
>>>
>>>     git fetch
>>>     git okay
>>>     stop server
>>>     backup data
>>>     git merge
>>>     start server
>>>
> I don't know a simple way to do the pre-merge check without actually
> doing the merge (other than patching git merge to add a --dry-run
> option)

Wouldn't that be a nice use-case for git-recursive-merge --index-only
($gmane/236753) ?