From: Konstantin Khomoutov <flatworm@users.sourceforge.net>
To: Pete Forman <petef4+usenet@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: How to pre-empt git pull merge error?
Date: Wed, 27 Nov 2013 19:42:40 +0400 [thread overview]
Message-ID: <20131127194240.2abaff5575961b3d73e1970f@domain007.com> (raw)
In-Reply-To: <86d2llc1rs.fsf@gmail.com>
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
>
> Here git okay is a place holder for the command I am asking for.
>
> If a file has been changed outside of a commit then git pull fails
> with the following error.
>
> error: Your local changes to '...' would be overwritten by merge.
> Aborting. Please, commit your changes or stash them before you can
> merge.
What's wrong with "git okay" being
if git merge whatever 2>/dev/null; then
... OK path
else
... "merge failed" path
fi
?
next prev parent reply other threads:[~2013-11-27 15:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-27 15:17 How to pre-empt git pull merge error? Pete Forman
2013-11-27 15:42 ` Konstantin Khomoutov [this message]
2013-11-27 15:54 ` Matthieu Moy
2013-11-27 16:38 ` Antoine Pelisse
2013-11-27 19:06 ` Thomas Rast
2013-11-28 8:25 ` Pete Forman
2013-11-27 20:09 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131127194240.2abaff5575961b3d73e1970f@domain007.com \
--to=flatworm@users.sourceforge.net \
--cc=git@vger.kernel.org \
--cc=petef4+usenet@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).